September 2017 - Wine-Commits

Gijs Vermeulen : msvcrt: Add _vfprintf_l.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: 4a75c37b41a8dabbdd96b6b255a98b6eb814e323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a75c37b41a8dabbdd96b6b25… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Sep 19 01:41:52 2017 +0200 msvcrt: Add _vfprintf_l. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 20 ++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a8c7862..1c95da9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1433,7 +1433,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5f4c497..86209ac 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1790,7 +1790,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 75f0428..c091bd1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1808,7 +1808,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index cd9c44d..0193282 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1502,7 +1502,7 @@ @ cdecl _utime32(str ptr) msvcr120._utime32 @ cdecl _utime64(str ptr) msvcr120._utime64 @ cdecl _vacopy(ptr ptr) msvcr120._vacopy -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) msvcr120._vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5cc8691..a08748c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1112,7 +1112,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 57a4741..1604d62 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1088,7 +1088,7 @@ @ stub _vcwprintf_p_l @ stub _vcwprintf_s @ stub _vcwprintf_s_l -@ stub _vfprintf_l +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index eb474c5..8af9bc2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5214,6 +5214,26 @@ int CDECL MSVCRT__stdio_common_vfwprintf_s(unsigned __int64 options, MSVCRT_FILE } /********************************************************************* + * _vfprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vfprintf_l(MSVCRT_FILE* file, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + BOOL tmp_buf; + int ret; + + if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); + ret = pf_printf_a(puts_clbk_file_a, file, format, locale, 0, arg_clbk_valist, NULL, &valist); + if(tmp_buf) remove_std_buffer(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * _vfwprintf_l (MSVCRT.@) */ int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1e2b043..4e80308 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1044,7 +1044,7 @@ # stub _vcwprintf_p_l(wstr ptr ptr) # stub _vcwprintf_s(wstr ptr) # stub _vcwprintf_s_l(wstr ptr ptr) -# stub _vfprintf_l(ptr str ptr ptr) +@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l # stub _vfprintf_p(ptr str ptr) # stub _vfprintf_p_l(ptr str ptr ptr) # stub _vfprintf_s_l(ptr str ptr ptr)

1 0

Fabian Maurer : mfuuid: Add library.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: 95633f368133bd51fcd777e0487f915e62a3d39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95633f368133bd51fcd777e04… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Sep 19 01:40:09 2017 +0200 mfuuid: Add library. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mfuuid/Makefile.in | 4 ++++ dlls/mfuuid/mfuuid.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/configure b/configure index 6643778..644dd4c 100755 --- a/configure +++ b/configure @@ -18444,6 +18444,7 @@ wine_fn_config_dll mf3216 enable_mf3216 wine_fn_config_dll mfplat enable_mfplat implib wine_fn_config_test dlls/mfplat/tests mfplat_test wine_fn_config_dll mfreadwrite enable_mfreadwrite +wine_fn_config_lib mfuuid wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang clean,implib diff --git a/configure.ac b/configure.ac index f5a617c..54ae425 100644 --- a/configure.ac +++ b/configure.ac @@ -3233,6 +3233,7 @@ WINE_CONFIG_DLL(mf3216) WINE_CONFIG_DLL(mfplat,,[implib]) WINE_CONFIG_TEST(dlls/mfplat/tests) WINE_CONFIG_DLL(mfreadwrite) +WINE_CONFIG_LIB(mfuuid) WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[clean,implib]) diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in new file mode 100644 index 0000000..5fbb522 --- /dev/null +++ b/dlls/mfuuid/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libmfuuid.a + +C_SRCS = \ + mfuuid.c diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c new file mode 100644 index 0000000..f9b1a8a --- /dev/null +++ b/dlls/mfuuid/mfuuid.c @@ -0,0 +1,30 @@ +/* + * GUID definitions + * + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Don't define those GUIDs here */ +#include "propsys.h" +#include "strmif.h" +#include "mediaobj.h" + +#include "initguid.h" + +#include "mfapi.h" +#include "mfidl.h" +#include "mfreadwrite.h"

1 0

Alistair Leslie-Hughes : qedit/tests: Add test for the IAMTimelineGroup interface.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: d107b91caa47b23d8788c8627f1b181138384689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d107b91caa47b23d8788c8627… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 19 04:10:08 2017 +0000 qedit/tests: Add test for the IAMTimelineGroup interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index 40cf774..4801743 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -108,9 +108,38 @@ static void test_timeline(void) ok(!timeline2, "Expected NULL got %p\n", timeline2); } +static void test_timelineobj_interfaces(void) +{ + HRESULT hr; + IAMTimeline *timeline = NULL; + IAMTimelineObj *obj; + + hr = CoCreateInstance(&CLSID_AMTimeline, NULL, CLSCTX_INPROC_SERVER, &IID_IAMTimeline, (void **)&timeline); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "CoCreateInstance failed: %08x\n", hr); + if (!timeline) + return; + + hr = IAMTimeline_CreateEmptyNode(timeline, &obj, TIMELINE_MAJOR_TYPE_GROUP); + ok(hr == S_OK, "CreateEmptyNode failed: %08x\n", hr); + if(hr == S_OK) + { + IAMTimelineGroup *group; + + hr = IAMTimelineObj_QueryInterface(obj, &IID_IAMTimelineGroup, (void **)&group); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + IAMTimelineGroup_Release(group); + + IAMTimelineObj_Release(obj); + } + + IAMTimeline_Release(timeline); +} + START_TEST(timeline) { CoInitialize(NULL); test_timeline(); + test_timelineobj_interfaces(); CoUninitialize(); }

1 0

Alexandre Julliard : ntdll: Set the initial process context on i386.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: 8b929bd759334611c0c957482060168fe441cd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b929bd759334611c0c957482… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 12:13:54 2017 +0200 ntdll: Set the initial process context on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a373e3d..4038436 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2600,7 +2600,20 @@ void signal_init_process( CONTEXT *context, LPTHREAD_START_ROUTINE entry ) wine_ldt_init_locking( ldt_lock, ldt_unlock ); - /* FIXME: set the initial context */ + /* build the initial context */ + context->ContextFlags = CONTEXT_FULL; + context->SegCs = wine_get_cs(); + context->SegDs = wine_get_ds(); + context->SegEs = wine_get_es(); + context->SegFs = wine_get_fs(); + context->SegGs = wine_get_gs(); + context->SegSs = wine_get_ss(); + context->Eax = (DWORD)entry; + context->Ebx = (DWORD)NtCurrentTeb()->Peb; + context->Esp = (DWORD)NtCurrentTeb()->Tib.StackBase - 16; + context->Eip = (DWORD)call_thread_entry_point; + ((void **)context->Esp)[1] = kernel32_start_process; + ((void **)context->Esp)[2] = entry; return; error:

1 0

Zebediah Figura : msi/tests: Move a test from format.c to package.c.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: ffef8bd41cd3bcc613270fe17f698bd0e2610c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffef8bd41cd3bcc613270fe17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 19 10:50:15 2017 -0500 msi/tests: Move a test from format.c to package.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/format.c | 511 ----------------------------------------------- dlls/msi/tests/package.c | 261 ++++++++++++++++++++++++ 2 files changed, 261 insertions(+), 511 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffef8bd41cd3bcc613270…

1 0

Zebediah Figura : msi/tests: Factor out success checks into table building functions.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: b91a27489254150e54835eca24440c0c05e272d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91a27489254150e54835eca2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 19 10:50:14 2017 -0500 msi/tests: Factor out success checks into table building functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 171 ++-- dlls/msi/tests/package.c | 2221 +++++++++++++++------------------------------- 2 files changed, 766 insertions(+), 1626 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91a27489254150e54835…

1 0

Nikolay Sivov : d3d9/tests: Some tests for D3DPRESENTFLAG_LOCKABLE_BACKBUFFER mode.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: a5328e51df65ffd0fead908a6bba921110bb718f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5328e51df65ffd0fead908a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 19 09:00:11 2017 +0300 d3d9/tests: Some tests for D3DPRESENTFLAG_LOCKABLE_BACKBUFFER mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d9cfb02b..fb30636 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11740,6 +11740,96 @@ static void test_destroyed_window(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_lockable_backbuffer(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; + IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; + D3DLOCKED_RECT lockrect; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + HDC dc; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); +todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + dc = (void *)0xdeadbeef; + hr = IDirect3DSurface9_GetDC(surface, &dc); + ok(dc == (void *)0xdeadbeef, "Unexpected DC returned.\n"); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + /* Reset with D3DPRESENTFLAG_LOCKABLE_BACKBUFFER. */ + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + + hr = IDirect3DDevice9_Reset(device, &present_parameters); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); +todo_wine + ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + device_desc.width = 640; + device_desc.height = 480; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_LOCKABLE_BACKBUFFER; + + device = create_device(d3d, window, &device_desc); + ok(!!device, "Failed to create device.\n"); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &lockrect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11859,6 +11949,7 @@ START_TEST(device) test_render_target_device_mismatch(); test_format_unknown(); test_destroyed_window(); + test_lockable_backbuffer(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Ihsan Akmal : include: Add d3d11_3.idl.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: b4940ebab16903985b64cf7401cfff68ac33fa37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4940ebab16903985b64cf740… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 19 13:14:33 2017 +0200 include: Add d3d11_3.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d11_3.idl | 384 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 385 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4940ebab16903985b64c…

1 0

Ihsan Akmal : include: Add d3d11_2.idl.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: bf01addd23b696a74e3accb89dc211c1d4908642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf01addd23b696a74e3accb89… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Tue Sep 19 13:14:32 2017 +0200 include: Add d3d11_2.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d11_2.idl | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 97617c0..9172dcc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -41,6 +41,7 @@ IDL_SRCS = \ d3d10sdklayers.idl \ d3d11.idl \ d3d11_1.idl \ + d3d11_2.idl \ d3d11sdklayers.idl \ d3dcommon.idl \ d3dx10core.idl \ diff --git a/include/d3d11_2.idl b/include/d3d11_2.idl new file mode 100644 index 0000000..bb4db02 --- /dev/null +++ b/include/d3d11_2.idl @@ -0,0 +1,173 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgi1_3.idl"; +import "d3dcommon.idl"; +import "d3d11_1.idl"; + +const UINT D3D11_PACKED_TILE = 0xffffffff; + +typedef enum D3D11_TILE_MAPPING_FLAG +{ + D3D11_TILE_MAPPING_NO_OVERWRITE = 0x1, +} D3D11_TILE_MAPPING_FLAG; + +typedef enum D3D11_TILE_RANGE_FLAG +{ + D3D11_TILE_RANGE_NULL = 0x1, + D3D11_TILE_RANGE_SKIP = 0x2, + D3D11_TILE_RANGE_REUSE_SINGLE_TILE = 0x4, +} D3D11_TILE_RANGE_FLAG; + +typedef enum D3D11_CHECK_MULTISAMPLE_QUALITY_LEVELS_FLAG +{ + D3D11_CHECK_MULTISAMPLE_QUALITY_LEVELS_TILED_RESOURCE = 0x1, +} D3D11_CHECK_MULTISAMPLE_QUALITY_LEVELS_FLAG; + +typedef enum D3D11_TILE_COPY_FLAG +{ + D3D11_TILE_COPY_NO_OVERWRITE = 0x1, + D3D11_TILE_COPY_LINEAR_BUFFER_TO_SWIZZLED_TILED_RESOURCE = 0x2, + D3D11_TILE_COPY_SWIZZLED_TILED_RESOURCE_TO_LINEAR_BUFFER = 0x4, +} D3D11_TILE_COPY_FLAG; + +typedef struct D3D11_TILED_RESOURCE_COORDINATE +{ + UINT X; + UINT Y; + UINT Z; + UINT Subresource; +} D3D11_TILED_RESOURCE_COORDINATE; + +typedef struct D3D11_TILE_REGION_SIZE +{ + UINT NumTiles; + BOOL bUseBox; + UINT Width; + UINT16 Height; + UINT16 Depth; +} D3D11_TILE_REGION_SIZE; + +typedef struct D3D11_SUBRESOURCE_TILING +{ + UINT WidthInTiles; + UINT16 HeightInTiles; + UINT16 DepthInTiles; + UINT StartTileIndexInOverallResource; +} D3D11_SUBRESOURCE_TILING; + +typedef struct D3D11_TILE_SHAPE +{ + UINT WidthInTexels; + UINT HeightInTexels; + UINT DepthInTexels; +} D3D11_TILE_SHAPE; + +typedef struct D3D11_PACKED_MIP_DESC +{ + UINT8 NumStandardMips; + UINT8 NumPackedMips; + UINT NumTilesForPackedMips; + UINT StartTileIndexInOverallResource; +} D3D11_PACKED_MIP_DESC; + +[ + uuid(420d5b32-b90c-4da4-bef0-359f6a24a83a), + object, + local, + pointer_default(unique) +] +interface ID3D11DeviceContext2 : ID3D11DeviceContext1 +{ + HRESULT UpdateTileMappings( + ID3D11Resource *resource, + UINT region_count, + const D3D11_TILED_RESOURCE_COORDINATE *region_start_coordinates, + const D3D11_TILE_REGION_SIZE *region_sizes, + ID3D11Buffer *pool, + UINT range_count, + const UINT *range_flags, + const UINT *pool_start_offsets, + const UINT *range_tile_counts, + UINT flags + ); + HRESULT CopyTileMappings( + ID3D11Resource *dst_resource, + const D3D11_TILED_RESOURCE_COORDINATE *dst_start_coordinate, + ID3D11Resource *src_resource, + const D3D11_TILED_RESOURCE_COORDINATE *src_start_coordinate, + const D3D11_TILE_REGION_SIZE *region_size, + UINT flags + ); + void CopyTiles( + ID3D11Resource *resource, + const D3D11_TILED_RESOURCE_COORDINATE *start_coordinate, + const D3D11_TILE_REGION_SIZE *size, + ID3D11Buffer *buffer, + UINT64 start_offset, + UINT flags + ); + void UpdateTiles( + ID3D11Resource *dst_resource, + const D3D11_TILED_RESOURCE_COORDINATE *dst_start_coordinate, + const D3D11_TILE_REGION_SIZE *dst_region_size, + const void *src_data, + UINT flags + ); + HRESULT ResizeTilePool( + ID3D11Buffer *pool, + UINT64 size + ); + void TiledResourceBarrier( + ID3D11DeviceChild *before_barrier, + ID3D11DeviceChild *after_barrier + ); + BOOL IsAnnotationEnabled(); + void SetMarkerInt(const WCHAR *label, int data); + void BeginEventInt(const WCHAR *label, int data); + void EndEvent(); +} + +[ + uuid(9d06dffa-d1e5-4d07-83a8-1bb123f2f841), + object, + local, + pointer_default(unique) +] +interface ID3D11Device2 : ID3D11Device1 +{ + void GetImmediateContext2(ID3D11DeviceContext2 **context); + HRESULT CreateDeferredContext2(UINT flags, ID3D11DeviceContext2 **context); + void GetResourceTiling( + ID3D11Resource *resource, + UINT *tile_count, + D3D11_PACKED_MIP_DESC *mip_desc, + D3D11_TILE_SHAPE *tile_shape, + UINT *subresource_tiling_count, + UINT first_subresource_tiling, + D3D11_SUBRESOURCE_TILING *subresource_tiling + ); + HRESULT CheckMultisampleQualityLevels1( + DXGI_FORMAT format, + UINT sample_count, + UINT flags, + UINT *quality_level_count + ); +}

1 0

Ihsan Akmal : include: Add dxgi1_3.idl.
by Alexandre Julliard Sept. 19, 2017

Sept. 19, 2017

Module: wine Branch: master Commit: 63975be059968b98c3a3bd92954d087088ededb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63975be059968b98c3a3bd929… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Mon Sep 18 17:59:35 2017 +0800 include: Add dxgi1_3.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgi1_3.idl | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2bd41e9..97617c0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -66,6 +66,7 @@ IDL_SRCS = \ dwrite_3.idl \ dxgi.idl \ dxgi1_2.idl \ + dxgi1_3.idl \ dxva2api.idl \ dyngraph.idl \ endpointvolume.idl \ diff --git a/include/dxgi1_3.idl b/include/dxgi1_3.idl new file mode 100644 index 0000000..5ea20dd --- /dev/null +++ b/include/dxgi1_3.idl @@ -0,0 +1,225 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "dxgi1_2.idl"; + +typedef struct DXGI_MATRIX_3X2_F +{ + float _11; + float _12; + float _21; + float _22; + float _31; + float _32; +} DXGI_MATRIX_3X2_F; + +typedef struct DXGI_DECODE_SWAP_CHAIN_DESC +{ + UINT Flags; +} DXGI_DECODE_SWAP_CHAIN_DESC; + +typedef enum DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS +{ + DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_NOMINAL_RANGE = 0x1, + DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_BT709 = 0x2, + DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_xvYCC = 0x4, +} DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS; + +typedef enum DXGI_FRAME_PRESENTATION_MODE +{ + DXGI_FRAME_PRESENTATION_MODE_COMPOSED = 0, + DXGI_FRAME_PRESENTATION_MODE_OVERLAY = 1, + DXGI_FRAME_PRESENTATION_MODE_NONE = 2, + DXGI_FRAME_PRESENTATION_MODE_COMPOSITION_FAILURE = 3, +} DXGI_FRAME_PRESENTATION_MODE; + +typedef struct DXGI_FRAME_STATISTICS_MEDIA +{ + UINT PresentCount; + UINT PresentRefreshCount; + UINT SyncRefreshCount; + LARGE_INTEGER SyncQPCTime; + LARGE_INTEGER SyncGPUTime; + DXGI_FRAME_PRESENTATION_MODE CompositionMode; + UINT ApprovedPresentDuration; +} DXGI_FRAME_STATISTICS_MEDIA; + +typedef enum DXGI_OVERLAY_SUPPORT_FLAG +{ + DXGI_OVERLAY_SUPPORT_FLAG_DIRECT = 0x1, + DXGI_OVERLAY_SUPPORT_FLAG_SCALING = 0x2, +} DXGI_OVERLAY_SUPPORT_FLAG; + +[ + object, + uuid(6007896c-3244-4afd-bf18-a6d3beda5023), + local, + pointer_default(unique) +] +interface IDXGIDevice3 : IDXGIDevice2 +{ + void Trim(); +} + +[ + object, + uuid(a8be2ac4-199f-4946-b331-79599fb98de7), + local, + pointer_default(unique) +] +interface IDXGISwapChain2 : IDXGISwapChain1 +{ + HRESULT SetSourceSize(UINT width, UINT height); + + HRESULT GetSourceSize( + [out] UINT *width, + [out] UINT *height + ); + + HRESULT SetMaximumFrameLatency(UINT max_latency); + + HRESULT GetMaximumFrameLatency( + [out] UINT *max_latency + ); + + HANDLE GetFrameLatencyWaitableObject(); + + HRESULT SetMatrixTransform(const DXGI_MATRIX_3X2_F *matrix); + + HRESULT GetMatrixTransform( + [out] DXGI_MATRIX_3X2_F *matrix + ); +} + +[ + object, + uuid(595e39d1-2724-4663-99b1-da969de28364), + local, + pointer_default(unique) +] +interface IDXGIOutput2 : IDXGIOutput1 +{ + BOOL SupportsOverlays(); +} + +[ + object, + uuid(25483823-cd46-4c7d-86ca-47aa95b837bd), + local, + pointer_default(unique) +] +interface IDXGIFactory3 : IDXGIFactory2 +{ + UINT GetCreationFlags(); +} + +[ + object, + uuid(2633066b-4514-4c7a-8fd8-12ea98059d18), + local, + pointer_default(unique) +] +interface IDXGIDecodeSwapChain : IUnknown +{ + HRESULT PresentBuffer(UINT buffer_to_present, UINT sync_interval, UINT flags); + + HRESULT SetSourceRect(const RECT *rect); + + HRESULT SetTargetRect(const RECT *rect); + + HRESULT SetDestSize(UINT width, UINT height); + + HRESULT GetSourceRect( + [out] RECT *rect + ); + + HRESULT GetTargetRect( + [out] RECT *rect + ); + + HRESULT GetDestSize( + [out] UINT *width, + [out] UINT *height + ); + + HRESULT SetColorSpace(DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS colorspace); + + DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS GetColorSpace(); +} + +[ + object, + uuid(41e7d1f2-a591-4f7b-a2e5-fa9c843e1c12), + local, + pointer_default(unique) +] +interface IDXGIFactoryMedia : IUnknown +{ + HRESULT CreateSwapChainForCompositionSurfaceHandle( + [in] IUnknown *device, + [in] HANDLE surface, + [in] const DXGI_SWAP_CHAIN_DESC1 *desc, + [in] IDXGIOutput *restrict_to_output, + [out] IDXGISwapChain1 **swapchain + ); + + HRESULT CreateDecodeSwapChainForCompositionSurfaceHandle( + [in] IUnknown *device, + [in] HANDLE surface, + [in] DXGI_DECODE_SWAP_CHAIN_DESC *desc, + [in] IDXGIResource *yuv_decode_buffers, + [in] IDXGIOutput *restrict_to_output, + [out] IDXGIDecodeSwapChain **swapchain + ); +} + +[ + object, + uuid(dd95b90b-f05f-4f6a-bd65-25bfb264bd84), + local, + pointer_default(unique) +] +interface IDXGISwapChainMedia : IUnknown +{ + HRESULT GetFrameStatisticsMedia( + [out] DXGI_FRAME_STATISTICS_MEDIA *stats + ); + + HRESULT SetPresentDuration(UINT duration); + + HRESULT CheckPresentDurationSupport( + UINT desired_present_duration, + [out] UINT *closest_smaller_present_duration, + [out] UINT *closest_larger_present_duration + ); +} + +[ + object, + uuid(8a6bb301-7e7e-41F4-a8e0-5b32f7f99b18), + local, + pointer_default(unique) +] +interface IDXGIOutput3 : IDXGIOutput2 +{ + HRESULT CheckOverlaySupport( + [in] DXGI_FORMAT enum_format, + [out] IUnknown *concerned_device, + [out] UINT *flags + ); +}

1 0