October 2015 - Wine-commits

Michael Müller : comctl32/tests: Add tests for LoadIconMetric function.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 1e2c0a30299effed99f18954c8072d02644239b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2c0a30299effed99f18954c… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 2 15:13:41 2015 +0200 comctl32/tests: Add tests for LoadIconMetric function. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/comctl32/tests/misc.c | 153 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 280b46c..ffd0dca 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <windows.h> +#include <commctrl.h> #include "wine/test.h" #include "v6util.h" @@ -36,6 +37,18 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static HMODULE hComctl32 = 0; +static char testicon_data[] = +{ + 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, + 0x20, 0x00, 0x40, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x12, 0x0b, + 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xde, 0xde, 0xde, 0xff, 0xde, 0xde, 0xde, 0xff, 0xde, 0xde, + 0xde, 0xff, 0xde, 0xde, 0xde, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 +}; + #define COMCTL32_GET_PROC(ordinal, func) \ p ## func = (void*)GetProcAddress(hComctl32, (LPSTR)ordinal); \ if(!p ## func) { \ @@ -205,6 +218,145 @@ static void test_TaskDialogIndirect(void) ok(ptr == ptr2, "got wrong pointer for ordinal 345, %p expected %p\n", ptr2, ptr); } +static void test_LoadIconWithScaleDown(void) +{ + static const WCHAR nonexisting_fileW[] = {'n','o','n','e','x','i','s','t','i','n','g','.','i','c','o',0}; + static const WCHAR nonexisting_resourceW[] = {'N','o','n','e','x','i','s','t','i','n','g',0}; + static const WCHAR prefixW[] = {'I','C','O',0}; + HRESULT (WINAPI *pLoadIconMetric)(HINSTANCE, const WCHAR *, int, HICON *); + HRESULT (WINAPI *pLoadIconWithScaleDown)(HINSTANCE, const WCHAR *, int, int, HICON *); + WCHAR tmp_path[MAX_PATH], icon_path[MAX_PATH]; + ICONINFO info; + HMODULE hinst; + HANDLE handle; + DWORD written; + HRESULT hr; + BITMAP bmp; + HICON icon; + void *ptr; + int bytes; + BOOL res; + + hinst = LoadLibraryA("comctl32.dll"); + pLoadIconMetric = (void *)GetProcAddress(hinst, "LoadIconMetric"); + pLoadIconWithScaleDown = (void *)GetProcAddress(hinst, "LoadIconWithScaleDown"); + if (!pLoadIconMetric || !pLoadIconWithScaleDown) + { + win_skip("LoadIconMetric or pLoadIconWithScaleDown not exported by name\n"); + FreeLibrary(hinst); + return; + } + + GetTempPathW(MAX_PATH, tmp_path); + GetTempFileNameW(tmp_path, prefixW, 0, icon_path); + handle = CreateFileW(icon_path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileW failed with error %u\n", GetLastError()); + res = WriteFile(handle, testicon_data, sizeof(testicon_data), &written, NULL); + ok(res && written == sizeof(testicon_data), "Failed to write icon file\n"); + CloseHandle(handle); + + /* test ordinals */ + ptr = GetProcAddress(hinst, (const char *)380); + ok(ptr == pLoadIconMetric, + "got wrong pointer for ordinal 380, %p expected %p\n", ptr, pLoadIconMetric); + + ptr = GetProcAddress(hinst, (const char *)381); + ok(ptr == pLoadIconWithScaleDown, + "got wrong pointer for ordinal 381, %p expected %p\n", ptr, pLoadIconWithScaleDown); + + /* invalid arguments */ + icon = (HICON)0x1234; + hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 0x100, &icon); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr); + ok(icon == NULL, "Expected NULL, got %p\n", icon); + + icon = (HICON)0x1234; + hr = pLoadIconMetric(NULL, NULL, LIM_LARGE, &icon); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr); + ok(icon == NULL, "Expected NULL, got %p\n", icon); + + icon = (HICON)0x1234; + hr = pLoadIconWithScaleDown(NULL, NULL, 32, 32, &icon); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr); + ok(icon == NULL, "Expected NULL, got %p\n", icon); + + /* non-existing filename */ + hr = pLoadIconMetric(NULL, nonexisting_fileW, LIM_LARGE, &icon); + todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); + + hr = pLoadIconWithScaleDown(NULL, nonexisting_fileW, 32, 32, &icon); + todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); + + /* non-existing resource name */ + hr = pLoadIconMetric(hinst, nonexisting_resourceW, LIM_LARGE, &icon); + ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); + + hr = pLoadIconWithScaleDown(hinst, nonexisting_resourceW, 32, 32, &icon); + ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); + + /* load icon using predefined identifier */ + hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_SMALL, &icon); + ok(hr == S_OK, "Expected S_OK, got %x\n", hr); + res = GetIconInfo(icon, &info); + ok(res, "Failed to get icon info, error %u\n", GetLastError()); + bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp); + ok(bytes > 0, "Failed to get bitmap info for icon\n"); + ok(bmp.bmWidth == GetSystemMetrics(SM_CXSMICON), "Wrong icon width %d\n", bmp.bmWidth); + ok(bmp.bmHeight == GetSystemMetrics(SM_CYSMICON), "Wrong icon height %d\n", bmp.bmHeight); + DestroyIcon(icon); + + hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_LARGE, &icon); + ok(hr == S_OK, "Expected S_OK, got %x\n", hr); + res = GetIconInfo(icon, &info); + ok(res, "Failed to get icon info, error %u\n", GetLastError()); + bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp); + ok(bytes > 0, "Failed to get bitmap info for icon\n"); + ok(bmp.bmWidth == GetSystemMetrics(SM_CXICON), "Wrong icon width %d\n", bmp.bmWidth); + ok(bmp.bmHeight == GetSystemMetrics(SM_CYICON), "Wrong icon height %d\n", bmp.bmHeight); + DestroyIcon(icon); + + hr = pLoadIconWithScaleDown(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 42, 42, &icon); + ok(hr == S_OK, "Expected S_OK, got %x\n", hr); + res = GetIconInfo(icon, &info); + ok(res, "Failed to get icon info, error %u\n", GetLastError()); + bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp); + ok(bytes > 0, "Failed to get bitmap info for icon\n"); + ok(bmp.bmWidth == 42, "Wrong icon width %d\n", bmp.bmWidth); + ok(bmp.bmHeight == 42, "Wrong icon height %d\n", bmp.bmHeight); + DestroyIcon(icon); + + /* load icon from file */ + hr = pLoadIconMetric(NULL, icon_path, LIM_SMALL, &icon); + ok(hr == S_OK, "Expected S_OK, got %x\n", hr); + res = GetIconInfo(icon, &info); + ok(res, "Failed to get icon info, error %u\n", GetLastError()); + bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp); + ok(bytes > 0, "Failed to get bitmap info for icon\n"); + ok(bmp.bmWidth == GetSystemMetrics(SM_CXSMICON), "Wrong icon width %d\n", bmp.bmWidth); + ok(bmp.bmHeight == GetSystemMetrics(SM_CYSMICON), "Wrong icon height %d\n", bmp.bmHeight); + DestroyIcon(icon); + + hr = pLoadIconWithScaleDown(NULL, icon_path, 42, 42, &icon); + ok(hr == S_OK, "Expected S_OK, got %x\n", hr); + res = GetIconInfo(icon, &info); + ok(res, "Failed to get icon info, error %u\n", GetLastError()); + bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp); + ok(bytes > 0, "Failed to get bitmap info for icon\n"); + ok(bmp.bmWidth == 42, "Wrong icon width %d\n", bmp.bmWidth); + ok(bmp.bmHeight == 42, "Wrong icon height %d\n", bmp.bmHeight); + DestroyIcon(icon); + + DeleteFileW(icon_path); + FreeLibrary(hinst); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -220,6 +372,7 @@ START_TEST(misc) return; test_TaskDialogIndirect(); + test_LoadIconWithScaleDown(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Andrew Eikum : xaudio2_7: Move XAudio 2.7 implementation into compat.c.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 3ecdbd2521a456445602ebe508278563f8e905da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ecdbd2521a456445602ebe50… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 2 08:49:29 2015 -0500 xaudio2_7: Move XAudio 2.7 implementation into compat.c. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/Makefile.in | 1 + dlls/xaudio2_7/compat.c | 582 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 599 +--------------------------------------- dlls/xaudio2_7/xaudio_private.h | 131 +++++++++ 4 files changed, 717 insertions(+), 596 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ecdbd2521a456445602e…

1 0

Andrew Eikum : xaudio2_3: Add compatibility implementation and forward to xaudio2_7.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 11cb83cf9483ca44da1f40d0a2d8281024c30c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11cb83cf9483ca44da1f40d0a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 2 08:49:36 2015 -0500 xaudio2_3: Add compatibility implementation and forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 + configure.ac | 1 + dlls/xaudio2_3/Makefile.in | 7 + dlls/xaudio2_3/xaudio2_3.spec | 4 + dlls/xaudio2_3/xaudio_classes.idl | 28 ++ dlls/xaudio2_3/xaudio_dll.c | 52 ++++ dlls/xaudio2_7/compat.c | 603 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 81 ++++- dlls/xaudio2_7/xaudio_private.h | 7 + include/xaudio2.idl | 140 +++++++++ 10 files changed, 910 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11cb83cf9483ca44da1f4…

1 0

Andrew Eikum : xaudio2_4: Forward to xaudio2_7.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: a7ae7b47e5601ed82b5ad37933b7385a3c9ed2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ae7b47e5601ed82b5ad3793… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 2 08:49:47 2015 -0500 xaudio2_4: Forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xaudio2_4/Makefile.in | 7 ++++++ dlls/xaudio2_4/xaudio2_4.spec | 4 +++ dlls/xaudio2_4/xaudio_classes.idl | 28 +++++++++++++++++++++ dlls/xaudio2_4/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 2 ++ include/xaudio2.idl | 7 ++++++ 8 files changed, 103 insertions(+) diff --git a/configure b/configure index 164f3aa..9d4323a 100755 --- a/configure +++ b/configure @@ -1375,6 +1375,7 @@ enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 enable_xaudio2_3 +enable_xaudio2_4 enable_xaudio2_7 enable_xaudio2_8 enable_xinput1_1 @@ -17913,6 +17914,7 @@ wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_3 enable_xaudio2_3 clean +wine_fn_config_dll xaudio2_4 enable_xaudio2_4 clean wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test wine_fn_config_dll xaudio2_8 enable_xaudio2_8 diff --git a/configure.ac b/configure.ac index 97370be..b8960e9 100644 --- a/configure.ac +++ b/configure.ac @@ -3461,6 +3461,7 @@ WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_3,,[clean]) +WINE_CONFIG_DLL(xaudio2_4,,[clean]) WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_TEST(dlls/xaudio2_7/tests) WINE_CONFIG_DLL(xaudio2_8) diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in new file mode 100644 index 0000000..9a9f19b --- /dev/null +++ b/dlls/xaudio2_4/Makefile.in @@ -0,0 +1,7 @@ +MODULE = xaudio2_4.dll +IMPORTS = ole32 + +C_SRCS = \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_4/xaudio2_4.spec b/dlls/xaudio2_4/xaudio2_4.spec new file mode 100644 index 0000000..cb263d4 --- /dev/null +++ b/dlls/xaudio2_4/xaudio2_4.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_4/xaudio_classes.idl b/dlls/xaudio2_4/xaudio_classes.idl new file mode 100644 index 0000000..26af295 --- /dev/null +++ b/dlls/xaudio2_4/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +[ + helpstring("XAudio2.4 Class"), + threading(both), + uuid(03219e78-5bc3-44d1-b92e-f63d89cc6526) +] +coclass XAudio24 { interface IXAudio27; } diff --git a/dlls/xaudio2_4/xaudio_dll.c b/dlls/xaudio2_4/xaudio_dll.c new file mode 100644 index 0000000..7c95c28 --- /dev/null +++ b/dlls/xaudio2_4/xaudio_dll.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance); +} diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index ed5ef49..0cea0dd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2462,6 +2462,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) if IsEqualGUID(rclsid, &CLSID_XAudio23){ factory = make_xaudio2_factory(23); + }else if(IsEqualGUID(rclsid, &CLSID_XAudio24)){ + factory = make_xaudio2_factory(24); }else if(IsEqualGUID(rclsid, &CLSID_XAudio2)){ factory = make_xaudio2_factory(27); }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter)) { diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 1730648..ec47092 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -38,6 +38,13 @@ coclass XAudio23 { } [ + uuid(03219e78-5bc3-44d1-b92e-f63d89cc6526) +] +coclass XAudio24 { + interface IUnknown; +} + +[ uuid(db05ea35-0329-4d4b-a53a-6dead03d3852) ] coclass XAudio2Debug {

1 0

Andrew Eikum : xaudio2_5: Forward to xaudio2_7.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: c4f49ac9656fa0f15dedef1121241fd33d2f7444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f49ac9656fa0f15dedef112… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 2 08:49:51 2015 -0500 xaudio2_5: Forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xaudio2_5/Makefile.in | 7 ++++++ dlls/xaudio2_5/xaudio2_5.spec | 4 +++ dlls/xaudio2_5/xaudio_classes.idl | 28 +++++++++++++++++++++ dlls/xaudio2_5/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 2 ++ include/xaudio2.idl | 7 ++++++ 8 files changed, 103 insertions(+) diff --git a/configure b/configure index 9d4323a..8af7bc8 100755 --- a/configure +++ b/configure @@ -1376,6 +1376,7 @@ enable_xapofx1_4 enable_xapofx1_5 enable_xaudio2_3 enable_xaudio2_4 +enable_xaudio2_5 enable_xaudio2_7 enable_xaudio2_8 enable_xinput1_1 @@ -17915,6 +17916,7 @@ wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_3 enable_xaudio2_3 clean wine_fn_config_dll xaudio2_4 enable_xaudio2_4 clean +wine_fn_config_dll xaudio2_5 enable_xaudio2_5 clean wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test wine_fn_config_dll xaudio2_8 enable_xaudio2_8 diff --git a/configure.ac b/configure.ac index b8960e9..e420df7 100644 --- a/configure.ac +++ b/configure.ac @@ -3462,6 +3462,7 @@ WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_3,,[clean]) WINE_CONFIG_DLL(xaudio2_4,,[clean]) +WINE_CONFIG_DLL(xaudio2_5,,[clean]) WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_TEST(dlls/xaudio2_7/tests) WINE_CONFIG_DLL(xaudio2_8) diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in new file mode 100644 index 0000000..6cc0565 --- /dev/null +++ b/dlls/xaudio2_5/Makefile.in @@ -0,0 +1,7 @@ +MODULE = xaudio2_5.dll +IMPORTS = ole32 + +C_SRCS = \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_5/xaudio2_5.spec b/dlls/xaudio2_5/xaudio2_5.spec new file mode 100644 index 0000000..cb263d4 --- /dev/null +++ b/dlls/xaudio2_5/xaudio2_5.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_5/xaudio_classes.idl b/dlls/xaudio2_5/xaudio_classes.idl new file mode 100644 index 0000000..78d7c1e --- /dev/null +++ b/dlls/xaudio2_5/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +[ + helpstring("XAudio2.5 Class"), + threading(both), + uuid(4c9b6dde-6809-46e6-a278-9b6a97588670) +] +coclass XAudio25 { interface IXAudio27; } diff --git a/dlls/xaudio2_5/xaudio_dll.c b/dlls/xaudio2_5/xaudio_dll.c new file mode 100644 index 0000000..7c95c28 --- /dev/null +++ b/dlls/xaudio2_5/xaudio_dll.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance); +} diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0cea0dd..23e0390 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2464,6 +2464,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) factory = make_xaudio2_factory(23); }else if(IsEqualGUID(rclsid, &CLSID_XAudio24)){ factory = make_xaudio2_factory(24); + }else if(IsEqualGUID(rclsid, &CLSID_XAudio25)){ + factory = make_xaudio2_factory(25); }else if(IsEqualGUID(rclsid, &CLSID_XAudio2)){ factory = make_xaudio2_factory(27); }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter)) { diff --git a/include/xaudio2.idl b/include/xaudio2.idl index ec47092..dfef62c 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -45,6 +45,13 @@ coclass XAudio24 { } [ + uuid(4c9b6dde-6809-46e6-a278-9b6a97588670) +] +coclass XAudio25 { + interface IUnknown; +} + +[ uuid(db05ea35-0329-4d4b-a53a-6dead03d3852) ] coclass XAudio2Debug {

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: fb53e0129098aa9729ce1f5822026a8b18b9cdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb53e0129098aa9729ce1f582… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 3 11:46:01 2015 +0200 po: Update French translation. --- po/fr.po | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0918427..f1a9401 100644 --- a/po/fr.po +++ b/po/fr.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: 2015-07-18 09:12+0100\n" +"PO-Revision-Date: 2015-10-03 11:45+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -7496,16 +7496,12 @@ msgid "&Convert..." msgstr "&Convertir..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objet" +msgstr "&Objet %1 %2" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Objet" +msgstr "&Objet %1" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9310,11 +9306,11 @@ msgstr "Volume" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Volume principal" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Muet" #: winspool.rc:37 msgid "Print to File" @@ -13010,18 +13006,18 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller : l'application de GUID « %1 » est introuvable\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller : l'option « --remove » doit être suivie d'un GUID " +"d'application\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Erreur : option « %c » invalide.\n" +msgstr "uninstaller : option [%1] invalide\n" #: uninstaller.rc:35 msgid "" @@ -13030,6 +13026,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Programme de désinstallation des applications Wine\n" +"\n" +"Désinstalle des applications du préfixe Wine courant.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -13044,6 +13044,17 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Usage :\n" +" uninstaller [options]\n" +"\n" +"Options :\n" +" --help\t Afficher ces informations.\n" +" --list\t Lister toutes les applications installées dans ce préfix " +"Wine.\n" +" --remove {GUID} Désinstaller l'application spécifiée.\n" +"\t\t Utilisez « --list » pour déterminer le GUID de l'application.\n" +" [aucune option] Lancer la version graphique de ce programme.\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

André Hentschel : maintainers: Add ARM, ARM64, Netstat, Winemaker and WPcap sections.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 67078791c28626e9e388787197d61d3922922494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67078791c28626e9e38878719… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 3 20:15:04 2015 +0200 maintainers: Add ARM, ARM64, Netstat, Winemaker and WPcap sections. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- MAINTAINERS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index c40bb68..9dba0d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -40,6 +40,13 @@ F: dlls/x3daudio*/ F: dlls/xapofx*/ F: dlls/xaudio*/ +ARM, ARM64 +M: André Hentschel <nerv(a)dawncrow.de> +F: dlls/dbghelp/cpu_arm* +F: dlls/msvcrt/except_arm.c +F: dlls/ntdll/signal_arm* +F: programs/winedbg/be_arm* + Direct2D M: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ @@ -92,6 +99,10 @@ MSI installers M: Hans Leidekker <hans(a)codeweavers.com> F: dlls/msi/ +Netstat +M: André Hentschel <nerv(a)dawncrow.de> +F: programs/netstat/ + OLE Typelibs P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/oleaut32/typelib.c @@ -100,6 +111,14 @@ Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> F: server/ +Winemaker +M: André Hentschel <nerv(a)dawncrow.de> +F: tools/winemaker + +WPcap +M: André Hentschel <nerv(a)dawncrow.de> +F: dlls/wpcap/ + VB Script M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/vbscript/

1 0

Józef Kucia : d3d11: Rename d3d10_geometry_shader to d3d_geometry_shader.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 6c8c61f41195e8390b49b4e42d5c41a97494a8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8c61f41195e8390b49b4e42… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 01:31:46 2015 +0200 d3d11: Rename d3d10_geometry_shader to d3d_geometry_shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 8 ++++---- dlls/d3d11/shader.c | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6d9489a..7819cac 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -241,7 +241,7 @@ HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_cod struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; /* ID3D10GeometryShader */ -struct d3d10_geometry_shader +struct d3d_geometry_shader { ID3D10GeometryShader ID3D10GeometryShader_iface; LONG refcount; @@ -250,9 +250,9 @@ struct d3d10_geometry_shader struct wined3d_shader *wined3d_shader; }; -HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d_device *device, +HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; -struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN; +struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN; /* ID3D11PixelShader, ID3D10PixelShader */ struct d3d_pixel_shader diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f56d3a9..8168fee 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -896,7 +896,7 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device1 *iface, ID3D10GeometryShader *shader) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_geometry_shader *gs = unsafe_impl_from_ID3D10GeometryShader(shader); + struct d3d_geometry_shader *gs = unsafe_impl_from_ID3D10GeometryShader(shader); TRACE("iface %p, shader %p.\n", iface, shader); @@ -1598,7 +1598,7 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device1 *iface, ID3D10GeometryShader **shader) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_geometry_shader *shader_impl; + struct d3d_geometry_shader *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2310,7 +2310,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device1 const void *byte_code, SIZE_T byte_code_length, ID3D10GeometryShader **shader) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_geometry_shader *object; + struct d3d_geometry_shader *object; HRESULT hr; TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p.\n", @@ -2320,7 +2320,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device1 if (!object) return E_OUTOFMEMORY; - hr = d3d10_geometry_shader_init(object, This, byte_code, byte_code_length); + hr = d3d_geometry_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) { WARN("Failed to initialize geometry shader, hr %#x.\n", hr); diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 40dac3d..25590d0 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -439,9 +439,9 @@ struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader return impl_from_ID3D10VertexShader(iface); } -static inline struct d3d10_geometry_shader *impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) +static inline struct d3d_geometry_shader *impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) { - return CONTAINING_RECORD(iface, struct d3d10_geometry_shader, ID3D10GeometryShader_iface); + return CONTAINING_RECORD(iface, struct d3d_geometry_shader, ID3D10GeometryShader_iface); } /* IUnknown methods */ @@ -468,7 +468,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_QueryInterface(ID3D10Geom static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_AddRef(ID3D10GeometryShader *iface) { - struct d3d10_geometry_shader *This = impl_from_ID3D10GeometryShader(iface); + struct d3d_geometry_shader *This = impl_from_ID3D10GeometryShader(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -478,7 +478,7 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_AddRef(ID3D10GeometryShader static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShader *iface) { - struct d3d10_geometry_shader *This = impl_from_ID3D10GeometryShader(iface); + struct d3d_geometry_shader *This = impl_from_ID3D10GeometryShader(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -503,7 +503,7 @@ static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShad static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -514,7 +514,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10Geom static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10GeometryShader *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -525,7 +525,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10Geom static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -545,20 +545,20 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = d3d10_geometry_shader_SetPrivateDataInterface, }; -static void STDMETHODCALLTYPE d3d10_geometry_shader_wined3d_object_destroyed(void *parent) +static void STDMETHODCALLTYPE d3d_geometry_shader_wined3d_object_destroyed(void *parent) { - struct d3d10_geometry_shader *shader = parent; + struct d3d_geometry_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } -static const struct wined3d_parent_ops d3d10_geometry_shader_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_geometry_shader_wined3d_parent_ops = { - d3d10_geometry_shader_wined3d_object_destroyed, + d3d_geometry_shader_wined3d_object_destroyed, }; -HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d_device *device, +HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { struct wined3d_shader_signature output_signature; @@ -588,7 +588,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct desc.max_version = 4; hr = wined3d_shader_create_gs(device->wined3d_device, &desc, shader, - &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader); + &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader); shader_free_signature(&input_signature); shader_free_signature(&output_signature); if (FAILED(hr)) @@ -603,7 +603,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct return S_OK; } -struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) +struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) { if (!iface) return NULL;

1 0

Józef Kucia : d3d11: Implement ID3D11GeometryShader interface.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: d8f8194b153597c4390e82cd0bce86ae8c067771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f8194b153597c4390e82cd0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 01:31:47 2015 +0200 d3d11: Implement ID3D11GeometryShader interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 3 +- dlls/d3d11/shader.c | 135 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 118 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 7819cac..d827040 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -240,9 +240,10 @@ HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_cod struct d3d_vertex_shader **shader) DECLSPEC_HIDDEN; struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; -/* ID3D10GeometryShader */ +/* ID3D11GeometryShader, ID3D10GeometryShader */ struct d3d_geometry_shader { + ID3D11GeometryShader ID3D11GeometryShader_iface; ID3D10GeometryShader ID3D10GeometryShader_iface; LONG refcount; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 25590d0..7f7ee13 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -439,60 +439,156 @@ struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader return impl_from_ID3D10VertexShader(iface); } -static inline struct d3d_geometry_shader *impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) +/* ID3D11GeometryShader methods */ + +static inline struct d3d_geometry_shader *impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface) { - return CONTAINING_RECORD(iface, struct d3d_geometry_shader, ID3D10GeometryShader_iface); + return CONTAINING_RECORD(iface, struct d3d_geometry_shader, ID3D11GeometryShader_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_QueryInterface(ID3D10GeometryShader *iface, +static HRESULT STDMETHODCALLTYPE d3d11_geometry_shader_QueryInterface(ID3D11GeometryShader *iface, REFIID riid, void **object) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + struct d3d_geometry_shader *shader = impl_from_ID3D11GeometryShader(iface); - if (IsEqualGUID(riid, &IID_ID3D10GeometryShader) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11GeometryShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11GeometryShader_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + if (IsEqualGUID(riid, &IID_ID3D10GeometryShader) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10GeometryShader_AddRef(&shader->ID3D10GeometryShader_iface); + *object = &shader->ID3D10GeometryShader_iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_AddRef(ID3D10GeometryShader *iface) +static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader *iface) { - struct d3d_geometry_shader *This = impl_from_ID3D10GeometryShader(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_geometry_shader *shader = impl_from_ID3D11GeometryShader(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", shader, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShader *iface) +static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShader *iface) { - struct d3d_geometry_shader *This = impl_from_ID3D10GeometryShader(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d_geometry_shader *shader = impl_from_ID3D11GeometryShader(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", shader, refcount); if (!refcount) { wined3d_mutex_lock(); - wined3d_shader_decref(This->wined3d_shader); + wined3d_shader_decref(shader->wined3d_shader); wined3d_mutex_unlock(); } return refcount; } +static void STDMETHODCALLTYPE d3d11_geometry_shader_GetDevice(ID3D11GeometryShader *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_geometry_shader_GetPrivateData(ID3D11GeometryShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_geometry_shader *shader = impl_from_ID3D11GeometryShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_geometry_shader_SetPrivateData(ID3D11GeometryShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_geometry_shader *shader = impl_from_ID3D11GeometryShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_geometry_shader_SetPrivateDataInterface(ID3D11GeometryShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_geometry_shader *shader = impl_from_ID3D11GeometryShader(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&shader->private_store, guid, data); +} + +static const struct ID3D11GeometryShaderVtbl d3d11_geometry_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_geometry_shader_QueryInterface, + d3d11_geometry_shader_AddRef, + d3d11_geometry_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_geometry_shader_GetDevice, + d3d11_geometry_shader_GetPrivateData, + d3d11_geometry_shader_SetPrivateData, + d3d11_geometry_shader_SetPrivateDataInterface, +}; + +/* ID3D10GeometryShader methods */ + +static inline struct d3d_geometry_shader *impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_geometry_shader, ID3D10GeometryShader_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_QueryInterface(ID3D10GeometryShader *iface, + REFIID riid, void **object) +{ + struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_geometry_shader_QueryInterface(&shader->ID3D11GeometryShader_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_AddRef(ID3D10GeometryShader *iface) +{ + struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_geometry_shader_AddRef(&shader->ID3D11GeometryShader_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShader *iface) +{ + struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_geometry_shader_Release(&shader->ID3D11GeometryShader_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShader *iface, ID3D10Device **device) @@ -567,6 +663,7 @@ HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_ struct wined3d_shader_desc desc; HRESULT hr; + shader->ID3D11GeometryShader_iface.lpVtbl = &d3d11_geometry_shader_vtbl; shader->ID3D10GeometryShader_iface.lpVtbl = &d3d10_geometry_shader_vtbl; shader->refcount = 1; wined3d_mutex_lock();

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateGeometryShader().
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 7da86b434ac0a25a3bb5f3e5063913bb1ddce38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da86b434ac0a25a3bb5f3e50… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 01:31:48 2015 +0200 d3d11: Implement d3d11_device_CreateGeometryShader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 30 ++++++++++++++++-------------- dlls/d3d11/shader.c | 24 +++++++++++++++++++++++- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index d827040..ab9edfa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -251,8 +251,8 @@ struct d3d_geometry_shader struct wined3d_shader *wined3d_shader; }; -HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_device *device, - const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; +HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d_geometry_shader **shader) DECLSPEC_HIDDEN; struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN; /* ID3D11PixelShader, ID3D10PixelShader */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8168fee..9f7d8c3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -215,10 +215,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device *i static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11GeometryShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_geometry_shader *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); - return E_NOTIMPL; + if (class_linkage) + FIXME("Class linkage is not implemented yet.\n"); + + if (FAILED(hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11GeometryShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShaderWithStreamOutput(ID3D11Device *iface, @@ -2309,26 +2321,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device1 * static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device1 *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10GeometryShader **shader) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_geometry_shader *object; HRESULT hr; TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p.\n", iface, byte_code, byte_code_length, shader); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - hr = d3d_geometry_shader_init(object, This, byte_code, byte_code_length); - if (FAILED(hr)) - { - WARN("Failed to initialize geometry shader, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, &object))) return hr; - } - TRACE("Created geometry shader %p.\n", object); *shader = &object->ID3D10GeometryShader_iface; return S_OK; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 7f7ee13..709ecba 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -654,7 +654,7 @@ static const struct wined3d_parent_ops d3d_geometry_shader_wined3d_parent_ops = d3d_geometry_shader_wined3d_object_destroyed, }; -HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_device *device, +static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { struct wined3d_shader_signature output_signature; @@ -700,6 +700,28 @@ HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_ return S_OK; } +HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d_geometry_shader **shader) +{ + struct d3d_geometry_shader *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_geometry_shader_init(object, device, byte_code, byte_code_length))) + { + WARN("Failed to initialize geometry shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created geometry shader %p.\n", object); + *shader = object; + + return S_OK; +} + struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) { if (!iface)

1 0