wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Akihiro Sagawa : kernel32: Return the list of module handles even if the last argument is null.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 844ae22fcfcca14ae66bc0f2458a0a2487d56de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=844ae22fcfcca14ae66bc0f2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 19 23:50:38 2018 +0900 kernel32: Return the list of module handles even if the last argument is null. Touhou Shinpiroku relies on this behaviour. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 14 ++++++++++---- dlls/psapi/tests/psapi_main.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d068f2a..b97c79b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1489,19 +1489,18 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, DWORD cb, DWORD *needed) { MODULE_ITERATOR iter; + DWORD size = 0; INT ret; if (!init_module_iterator(&iter, process)) return FALSE; - if ((cb && !lphModule) || !needed) + if (cb && !lphModule) { SetLastError(ERROR_NOACCESS); return FALSE; } - *needed = 0; - while ((ret = module_iterator_next(&iter)) > 0) { if (cb >= sizeof(HMODULE)) @@ -1509,8 +1508,15 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, *lphModule++ = iter.ldr_module.BaseAddress; cb -= sizeof(HMODULE); } - *needed += sizeof(HMODULE); + size += sizeof(HMODULE); + } + + if (!needed) + { + SetLastError(ERROR_NOACCESS); + return FALSE; } + *needed = size; return ret == 0; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 30059c5..8638d73 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -132,7 +132,7 @@ static void test_EnumProcessModules(void) ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); - todo_wine ok(hMod == GetModuleHandleA(NULL), + ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); SetLastError(0xdeadbeef);

1 0

Jacek Caban : schtests: Added /create command implementation.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 74b386d4a25d6823e2c7f5f03d52f299fac1fe7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b386d4a25d6823e2c7f5f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 19 19:16:29 2018 +0100 schtests: Added /create command implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 127 +++++++++++++++++++++++++++++++++++++ programs/schtasks/tests/schtasks.c | 72 ++++++++++++++++----- 2 files changed, 182 insertions(+), 17 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 88a004f..5967e4a 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -27,10 +27,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; +static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; static const WCHAR f_optW[] = {'/','f',0}; static const WCHAR tn_optW[] = {'/','t','n',0}; +static const WCHAR xml_optW[] = {'/','x','m','l',0}; static ITaskFolder *get_tasks_root_folder(void) { @@ -84,6 +86,51 @@ static IRegisteredTask *get_registered_task(const WCHAR *name) return registered_task; } +static BSTR read_file_to_bstr(const WCHAR *file_name) +{ + LARGE_INTEGER file_size; + DWORD read_size, size; + unsigned char *data; + HANDLE file; + BOOL r = FALSE; + BSTR ret; + + file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) { + FIXME("Could not open file\n"); + return NULL; + } + + if (!GetFileSizeEx(file, &file_size) || !file_size.QuadPart) { + FIXME("Empty file\n"); + CloseHandle(file); + return NULL; + } + + data = HeapAlloc(GetProcessHeap(), 0, file_size.QuadPart); + if (data) + r = ReadFile(file, data, file_size.QuadPart, &read_size, NULL); + CloseHandle(file); + if (!r) { + FIXME("Read filed\n"); + HeapFree(GetProcessHeap(), 0, data); + return NULL; + } + + if (read_size > 2 && data[0] == 0xff && data[1] == 0xfe) { /* UTF-16 BOM */ + ret = SysAllocStringLen((const WCHAR *)(data + 2), (read_size - 2) / sizeof(WCHAR)); + }else { + size = MultiByteToWideChar(CP_ACP, 0, (const char *)data, read_size, NULL, 0); + ret = SysAllocStringLen(NULL, size); + if (ret) + MultiByteToWideChar(CP_ACP, 0, (const char *)data, read_size, ret, size); + } + HeapFree(GetProcessHeap(), 0, data); + + return ret; +} + static int change_command(int argc, WCHAR *argv[]) { const WCHAR *task_name; @@ -132,6 +179,84 @@ static int change_command(int argc, WCHAR *argv[]) return 0; } +static int create_command(int argc, WCHAR *argv[]) +{ + const WCHAR *task_name = NULL, *xml_file = NULL; + ITaskFolder *root = NULL; + IRegisteredTask *task; + VARIANT empty; + BSTR str, xml; + HRESULT hres; + + while (argc) { + if (!strcmpiW(argv[0], xml_optW)) { + if (argc < 2) { + FIXME("Missing /xml value\n"); + return 1; + } + + if (xml_file) { + FIXME("Duplicated /xml argument\n"); + return 1; + } + + xml_file = argv[1]; + argc -= 2; + argv += 2; + }else if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); + return 1; + } + } + + if (!task_name) { + FIXME("Missing /tn argument\n"); + return 1; + } + + if (!xml_file) { + FIXME("Missing /xml argument\n"); + return E_FAIL; + } + + xml = read_file_to_bstr(xml_file); + if (!xml) + return 1; + + root = get_tasks_root_folder(); + if (!root) { + SysFreeString(xml); + return 1; + } + + V_VT(&empty) = VT_EMPTY; + str = SysAllocString(task_name); + hres = ITaskFolder_RegisterTask(root, str, xml, TASK_CREATE, empty, empty, + TASK_LOGON_NONE, empty, &task); + SysFreeString(str); + SysFreeString(xml); + ITaskFolder_Release(root); + if (FAILED(hres)) + return 1; + + IRegisteredTask_Release(task); + return 0; +} + static int delete_command(int argc, WCHAR *argv[]) { const WCHAR *task_name = NULL; @@ -197,6 +322,8 @@ int wmain(int argc, WCHAR *argv[]) FIXME("Print current tasks state\n"); else if (!strcmpiW(argv[1], change_optW)) ret = change_command(argc - 2, argv + 2); + else if (!strcmpiW(argv[1], create_optW)) + ret = create_command(argc - 2, argv + 2); else if (!strcmpiW(argv[1], delete_optW)) ret = delete_command(argc - 2, argv + 2); else diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 7765038..9f1b920 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -26,6 +26,23 @@ static ITaskService *service; static ITaskFolder *root; +static const char xml_a[] = + "<?xml version=\"1.0\"?>\n" + "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" + " <RegistrationInfo>\n" + " <Description>\"Task1\"</Description>\n" + " </RegistrationInfo>\n" + " <Settings>\n" + " <Enabled>false</Enabled>\n" + " <Hidden>false</Hidden>\n" + " </Settings>\n" + " <Actions>\n" + " <Exec>\n" + " <Command>\"task1.exe\"</Command>\n" + " </Exec>\n" + " </Actions>\n" + "</Task>\n"; + static WCHAR *a2w(const char *str) { WCHAR *ret; @@ -81,23 +98,6 @@ static void _register_task(unsigned line, const char *task_name_a) WCHAR *task_name, *xml; HRESULT hres; - static const char xml_a[] = - "<?xml version=\"1.0\"?>\n" - "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" - " <RegistrationInfo>\n" - " <Description>\"Task1\"</Description>\n" - " </RegistrationInfo>\n" - " <Settings>\n" - " <Enabled>false</Enabled>\n" - " <Hidden>false</Hidden>\n" - " </Settings>\n" - " <Actions>\n" - " <Exec>\n" - " <Command>\"task1.exe\"</Command>\n" - " </Exec>\n" - " </Actions>\n" - "</Task>\n"; - V_VT(&empty) = VT_EMPTY; task_name = a2w(task_name_a); xml = a2w(xml_a); @@ -128,6 +128,23 @@ static void _unregister_task(unsigned line, const char *task_name_a) HeapFree(GetProcessHeap(), 0, task_name); } +static void create_file(const char *file_name, const char *data) +{ + HANDLE file; + DWORD size; + BOOL r; + + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + if(file == INVALID_HANDLE_VALUE) + return; + + r = WriteFile(file, data, strlen(data), &size, NULL); + ok(r, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); +} + static BOOL initialize_task_service(void) { VARIANT empty; @@ -186,8 +203,29 @@ START_TEST(schtasks) r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); ok(r == 1, "r = %u\n", r); + create_file("test.xml", xml_a); + + r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); + ok(r == 0, "r = %u\n", r); + + r = run_command("schtasks /change /tn wine\\winetest /enable"); + ok(r == 0, "r = %u\n", r); + + r = run_command("schtasks /create /xml test.xml /tn wine\\winetest"); + ok(r == 1, "r = %u\n", r); /* task already exists */ + + r = run_command("schtasks /create /tn wine\\winetest"); + ok(r == E_FAIL, "r = %x\n", r); /* missing arguments */ + + r = run_command("schtasks /Delete /f /tn wine\\winetest"); + ok(r == 0, "r = %u\n", r); + + r = DeleteFileA("test.xml"); + ok(r, "DeleteFileA failed: %u\n", GetLastError()); + ITaskFolder_DeleteFolder(root, wine_testW, 0); ITaskFolder_DeleteFolder(root, wineW, 0); + ITaskFolder_Release(root); ITaskService_Release(service); CoUninitialize();

1 0

Jacek Caban : schtasks: Added /delete command implementation.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: c6f66c6b98b6a6d22874f3a59bcbd4f55b5d2e8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f66c6b98b6a6d22874f3a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 19 19:16:20 2018 +0100 schtasks: Added /delete command implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 87 +++++++++++++++++++++++++++++++++----- programs/schtasks/tests/schtasks.c | 3 +- 2 files changed, 79 insertions(+), 11 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 24d6876..88a004f 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -26,17 +26,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); -const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; -const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; -const WCHAR tn_optW[] = {'/','t','n',0}; +static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; +static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; +static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; +static const WCHAR f_optW[] = {'/','f',0}; +static const WCHAR tn_optW[] = {'/','t','n',0}; -static IRegisteredTask *get_registered_task(const WCHAR *name) +static ITaskFolder *get_tasks_root_folder(void) { - IRegisteredTask *registered_task; ITaskService *service; - ITaskFolder *folder; + ITaskFolder *root; VARIANT empty; - BSTR str; HRESULT hres; hres = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, @@ -51,17 +51,31 @@ static IRegisteredTask *get_registered_task(const WCHAR *name) return NULL; } - hres = ITaskService_GetFolder(service, NULL, &folder); + hres = ITaskService_GetFolder(service, NULL, &root); ITaskService_Release(service); if (FAILED(hres)) { FIXME("GetFolder failed: %08x\n", hres); return NULL; } + return root; +} + +static IRegisteredTask *get_registered_task(const WCHAR *name) +{ + IRegisteredTask *registered_task; + ITaskFolder *root; + BSTR str; + HRESULT hres; + + root = get_tasks_root_folder(); + if (!root) + return NULL; + str = SysAllocString(name); - hres = ITaskFolder_GetTask(folder, str, &registered_task); + hres = ITaskFolder_GetTask(root, str, &registered_task); SysFreeString(str); - ITaskFolder_Release(folder); + ITaskFolder_Release(root); if (FAILED(hres)) { FIXME("GetTask failed: %08x\n", hres); return NULL; @@ -118,6 +132,57 @@ static int change_command(int argc, WCHAR *argv[]) return 0; } +static int delete_command(int argc, WCHAR *argv[]) +{ + const WCHAR *task_name = NULL; + ITaskFolder *root = NULL; + BSTR str; + HRESULT hres; + + while (argc) { + if (!strcmpiW(argv[0], f_optW)) { + TRACE("force opt\n"); + argc--; + argv++; + }else if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); + return 1; + } + } + + if (!task_name) { + FIXME("Missing /tn argument\n"); + return 1; + } + + root = get_tasks_root_folder(); + if (!root) + return 1; + + str = SysAllocString(task_name); + hres = ITaskFolder_DeleteTask(root, str, 0); + SysFreeString(str); + ITaskFolder_Release(root); + if (FAILED(hres)) + return 1; + + return 0; +} + int wmain(int argc, WCHAR *argv[]) { int i, ret = 0; @@ -132,6 +197,8 @@ int wmain(int argc, WCHAR *argv[]) FIXME("Print current tasks state\n"); else if (!strcmpiW(argv[1], change_optW)) ret = change_command(argc - 2, argv + 2); + else if (!strcmpiW(argv[1], delete_optW)) + ret = delete_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1])); diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 03f4e43..7765038 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -180,7 +180,8 @@ START_TEST(schtasks) r = run_command("schtasks /CHANGE /tn wine\\test\\winetest /enable"); ok(r == 0, "r = %u\n", r); - unregister_task("wine\\test\\winetest"); + r = run_command("schtasks /delete /f /tn wine\\test\\winetest"); + ok(r == 0, "r = %u\n", r); r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); ok(r == 1, "r = %u\n", r);

1 0

Henri Verbeet : winex11: Failing to create a context in X11DRV_wglCreateContextAttribsARB() is not an internal error.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 1246a27730e657f92146bfc4b8f0776ed0ccf2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1246a27730e657f92146bfc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 19 19:25:16 2018 +0100 winex11: Failing to create a context in X11DRV_wglCreateContextAttribsARB() is not an internal error. In particular, without WGL_WINE_query_renderer, the only way to determine whether a particular context version is supported or not is by attempting to create a context with that version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5a7cfcc..e665286 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2143,7 +2143,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg if ((err = X11DRV_check_error()) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ - ERR("Context creation failed (error %x)\n", err); + WARN("Context creation failed (error %#x).\n", err); HeapFree( GetProcessHeap(), 0, ret ); ret = NULL; }

1 0

Henri Verbeet : d3d11: Validate the DXBC version.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: ed0b366322f4bd36d6462294bc529b25a073f369 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed0b366322f4bd36d6462294… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 19 19:25:15 2018 +0100 d3d11: Validate the DXBC version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index c9e137c..c72216d 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -789,6 +789,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; read_dword(&ptr, &tag); @@ -803,7 +804,13 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_INVALIDARG; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0

Henri Verbeet : d3d10: Validate the DXBC version.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 8553df475ec32a9caf68a4b3f8ffd2289aa6eabf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8553df475ec32a9caf68a4b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 19 19:25:14 2018 +0100 d3d10: Validate the DXBC version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 39b0902..223b33a 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -159,6 +159,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; if (!data) @@ -179,7 +180,13 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, /* checksum? */ skip_dword_unknown("DXBC header", &ptr, 4); - skip_dword_unknown("DXBC header", &ptr, 1); + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_FAIL; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0

Józef Kucia : dxgi: Implement CreateDXGIFactory2().
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: e72db8de9568bc9dfd38f92fe9fd0737b37edefb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e72db8de9568bc9dfd38f92f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:17 2018 +0100 dxgi: Implement CreateDXGIFactory2(). 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/dxgi/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 22 ++++++++++++++++------ include/dxgi1_3.idl | 6 ++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index 3270a53..801e6a4 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -1,4 +1,5 @@ @ stdcall CreateDXGIFactory(ptr ptr) @ stdcall CreateDXGIFactory1(ptr ptr) +@ stdcall CreateDXGIFactory2(long ptr ptr) @ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr long ptr) @ stdcall DXGID3D10RegisterLayers(ptr long) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 60ff3c1..36cf73b 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -56,18 +56,28 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; } -HRESULT WINAPI CreateDXGIFactory1(REFIID riid, void **factory) +HRESULT WINAPI CreateDXGIFactory2(UINT flags, REFIID iid, void **factory) { - TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); + TRACE("flags %#x, iid %s, factory %p.\n", flags, debugstr_guid(iid), factory); - return dxgi_factory_create(riid, factory, TRUE); + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + return dxgi_factory_create(iid, factory, TRUE); +} + +HRESULT WINAPI CreateDXGIFactory1(REFIID iid, void **factory) +{ + TRACE("iid %s, factory %p.\n", debugstr_guid(iid), factory); + + return dxgi_factory_create(iid, factory, TRUE); } -HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) +HRESULT WINAPI CreateDXGIFactory(REFIID iid, void **factory) { - TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); + TRACE("iid %s, factory %p.\n", debugstr_guid(iid), factory); - return dxgi_factory_create(riid, factory, FALSE); + return dxgi_factory_create(iid, factory, FALSE); } static BOOL get_layer(enum dxgi_device_layer_id id, struct dxgi_device_layer *layer) diff --git a/include/dxgi1_3.idl b/include/dxgi1_3.idl index 5ea20dd..b43ca23 100644 --- a/include/dxgi1_3.idl +++ b/include/dxgi1_3.idl @@ -223,3 +223,9 @@ interface IDXGIOutput3 : IDXGIOutput2 [out] UINT *flags ); } + +const UINT DXGI_CREATE_FACTORY_DEBUG = 0x1; + +[local] HRESULT __stdcall CreateDXGIFactory2(UINT flags, REFIID iid, void **factory); + +[local] HRESULT __stdcall DXGIGetDebugInterface1(UINT flags, REFIID iid, void **debug);

1 0

Józef Kucia : dxgi: Update to IDXGIFactory4.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: f2d8491ed920e93f5d81ad064843ba08f7d66572 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d8491ed920e93f5d81ad06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:16 2018 +0100 dxgi: Update to IDXGIFactory4. 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/dxgi/adapter.c | 6 +-- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 4 +- dlls/dxgi/factory.c | 117 ++++++++++++++++++++++++++++++----------------- 4 files changed, 80 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2d8491ed920e93f5d81…

1 0

Józef Kucia : dxgi: Implement dxgi_factory_CreateSwapChainForHwnd().
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 729baa8a91fdc45ed66e0f8230a38a769beea87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=729baa8a91fdc45ed66e0f82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:15 2018 +0100 dxgi: Implement dxgi_factory_CreateSwapChainForHwnd(). 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/dxgi/factory.c | 151 ++++++++++++++++++++++++++++++----------------- dlls/dxgi/tests/device.c | 8 ++- 2 files changed, 105 insertions(+), 54 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 106efb5..1d699f5 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -184,15 +184,90 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory2 static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *iface, IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) { + struct dxgi_factory *factory = impl_from_IDXGIFactory2(iface); + DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + + TRACE("iface %p, device %p, desc %p, swapchain %p.\n", iface, device, desc, swapchain); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + swapchain_desc.Width = desc->BufferDesc.Width; + swapchain_desc.Height = desc->BufferDesc.Height; + swapchain_desc.Format = desc->BufferDesc.Format; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc = desc->SampleDesc; + swapchain_desc.BufferUsage = desc->BufferUsage; + swapchain_desc.BufferCount = desc->BufferCount; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = desc->SwapEffect; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_IGNORE; + swapchain_desc.Flags = desc->Flags; + + fullscreen_desc.RefreshRate = desc->BufferDesc.RefreshRate; + fullscreen_desc.ScanlineOrdering = desc->BufferDesc.ScanlineOrdering; + fullscreen_desc.Scaling = desc->BufferDesc.Scaling; + fullscreen_desc.Windowed = desc->Windowed; + + return IDXGIFactory2_CreateSwapChainForHwnd(&factory->IDXGIFactory2_iface, + device, desc->OutputWindow, &swapchain_desc, &fullscreen_desc, NULL, + (IDXGISwapChain1 **)swapchain); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory2 *iface, + HMODULE swrast, IDXGIAdapter **adapter) +{ + FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IDXGIFactory2 *iface) +{ + FIXME("iface %p stub!\n", iface); + + return TRUE; +} + +static BOOL STDMETHODCALLTYPE dxgi_factory_IsWindowedStereoEnabled(IDXGIFactory2 *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactory2 *iface, + IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, + IDXGIOutput *output, IDXGISwapChain1 **swapchain) +{ struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_desc wined3d_desc; unsigned int min_buffer_count; IWineDXGIDevice *dxgi_device; HRESULT hr; - FIXME("iface %p, device %p, desc %p, swapchain %p partial stub!\n", iface, device, desc, swapchain); + FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " + "output %p, swapchain %p partial stub!\n", + iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); - switch (desc->SwapEffect) + if (!device || !swapchain_desc || !swapchain) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + if (swapchain_desc->Stereo) + { + FIXME("Stereo swapchains are not supported.\n"); + return DXGI_ERROR_UNSUPPORTED; + } + + switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: case DXGI_SWAP_EFFECT_SEQUENTIAL: @@ -205,42 +280,46 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *ifa break; default: - WARN("Invalid swap effect %u used, returning DXGI_ERROR_INVALID_CALL.\n", desc->SwapEffect); + WARN("Invalid swap effect %u used.\n", swapchain_desc->SwapEffect); return DXGI_ERROR_INVALID_CALL; } - if (desc->BufferCount < min_buffer_count || desc->BufferCount > 16) + if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > 16) { - WARN("BufferCount is %u, returning DXGI_ERROR_INVALID_CALL.\n", desc->BufferCount); + WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); return DXGI_ERROR_INVALID_CALL; } - if (!desc->OutputWindow) + if (!window) { FIXME("No output window, should use factory output window.\n"); } - hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device); - if (FAILED(hr)) + if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { ERR("This is not the device we're looking for\n"); return hr; } - FIXME("Ignoring SwapEffect %#x.\n", desc->SwapEffect); - - wined3d_desc.backbuffer_width = desc->BufferDesc.Width; - wined3d_desc.backbuffer_height = desc->BufferDesc.Height; - wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(desc->BufferDesc.Format); - wined3d_desc.backbuffer_count = desc->BufferCount; + if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); + if (swapchain_desc->SwapEffect) + FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); + if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + + wined3d_desc.backbuffer_width = swapchain_desc->Width; + wined3d_desc.backbuffer_height = swapchain_desc->Height; + wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); + wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, - &wined3d_desc.multisample_quality, &desc->SampleDesc); + &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - wined3d_desc.device_window = desc->OutputWindow; - wined3d_desc.windowed = desc->Windowed; + wined3d_desc.device_window = window; + wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; wined3d_desc.enable_auto_depth_stencil = FALSE; wined3d_desc.auto_depth_stencil_format = 0; - wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(desc->Flags); - wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); + wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); + wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; wined3d_desc.auto_restore_display_mode = TRUE; @@ -259,40 +338,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory2 *iface, - HMODULE swrast, IDXGIAdapter **adapter) -{ - FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter); - - return E_NOTIMPL; -} - -static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IDXGIFactory2 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return TRUE; -} - -static BOOL STDMETHODCALLTYPE dxgi_factory_IsWindowedStereoEnabled(IDXGIFactory2 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return FALSE; -} - -static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactory2 *iface, - IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, - IDXGIOutput *output, IDXGISwapChain1 **swapchain) -{ - FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p stub!\n", - iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); - - return E_NOTIMPL; -} - static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForCoreWindow(IDXGIFactory2 *iface, IUnknown *device, IUnknown *window, const DXGI_SWAP_CHAIN_DESC1 *desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7cfaea4..77b7cb7 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -932,8 +932,14 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + hr = IDXGIFactory_CreateSwapChain(factory, NULL, &creation_desc, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, obj, NULL, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)adapter); ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount);

1 0

Józef Kucia : dxgi: Update to IDXGISwapChain1.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 9e961e1fae3715d2f5de8598d1cc09a784452cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e961e1fae3715d2f5de8598… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:14 2018 +0100 dxgi: Update to IDXGISwapChain1. 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/d3d10_1/tests/d3d10_1.c | 4 +- dlls/d3d11/tests/d3d11.c | 2 + dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 238 +++++++++++++++++++++++++++++++++---------- dlls/dxgi/tests/device.c | 16 ++- 5 files changed, 207 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e961e1fae3715d2f5de…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018