March 2016 - Wine-commits - list.winehq.org

Theodore Dubois : shell32/tests: Additional tests for IQueryAssociations.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 9e05c66c03cfa6df33fea0c13b944684bca9999f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e05c66c03cfa6df33fea0c13… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Wed Mar 16 13:19:51 2016 -0700 shell32/tests: Additional tests for IQueryAssociations. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 8aa2535..0077f1e 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -100,14 +100,79 @@ static struct assoc_getstring_test getstring_tests[] = { NULL } }; +static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCWSTR expected_string, int line_num) +{ + IQueryAssociations *assoc; + HRESULT hr; + WCHAR *buffer; + DWORD len; + + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); + ok(hr == S_OK, "line %d: failed to create IQueryAssociations, 0x%x\n", line_num, hr); + hr = IQueryAssociations_Init(assoc, 0, assocName, progIdKey, NULL); + ok(hr == S_OK, "line %d: IQueryAssociations::Init failed, 0x%x\n", line_num, hr); + + hr = IQueryAssociations_GetString(assoc, 0, str, NULL, NULL, &len); + if (hr != S_FALSE) { + if (expected_string) { + ok(SUCCEEDED(hr), "line %d: GetString returned 0x%x, expected success\n", line_num, hr); + } else { + ok(FAILED(hr), "line %d: GetString returned 0x%x, expected failure\n", line_num, hr); + } + } + + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ok(buffer != NULL, "line %d: out of memory\n", line_num); + hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); + + if (expected_string) { + ok(lstrcmpW(buffer, expected_string) == 0, "line %d: GetString returned %s, expected %s\n", line_num, + wine_dbgstr_w(buffer), wine_dbgstr_w(expected_string)); + } +} + static void test_IQueryAssociations_GetString(void) { + static WCHAR test_extensionW[] = {'.','t','e','s','t',0}; + static WCHAR test_progidW[] = {'t','e','s','t','f','i','l','e',0}; + static WCHAR DefaultIconW[] = {'D','e','f','a','u','l','t','I','c','o','n',0}; + /* folder.ico, why not */ + static WCHAR test_iconW[] = {'s','h','e','l','l','3','2','.','d','l','l',',','1',0}; + HKEY test_extension_key; + HKEY test_progid_key; + HKEY test_defaulticon_key; + LRESULT r; + struct assoc_getstring_test *ptr = getstring_tests; IQueryAssociations *assoc; HRESULT hr; DWORD len; int i = 0; + r = RegCreateKeyExW(HKEY_CLASSES_ROOT, test_extensionW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &test_extension_key, NULL); + ok(r == ERROR_SUCCESS, "RegCreateKeyExW(HKCR, \".test\") failed: 0x%lx\n", r); + r = RegSetValueExW(test_extension_key, NULL, 0, REG_SZ, (PBYTE)test_progidW, sizeof(test_progidW)); + ok(r == ERROR_SUCCESS, "RegSetValueExW(HKCR\\.test, NULL, \"testfile\") failed: 0x%lx\n", r); + + /* adding progid key with no information shuld fail to return information */ + r = RegCreateKeyExW(HKEY_CLASSES_ROOT, test_progidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &test_progid_key, NULL); + ok(r == ERROR_SUCCESS, "RegCreateKeyExW(HKCR, \"testfile\") failed: 0x%lx\n", r); + getstring_test(test_extensionW, NULL, ASSOCSTR_DEFAULTICON, NULL, __LINE__); + getstring_test(test_progidW, NULL, ASSOCSTR_DEFAULTICON, NULL, __LINE__); + getstring_test(NULL, test_progid_key, ASSOCSTR_DEFAULTICON, NULL, __LINE__); + + /* adding information to the progid should return that information */ + r = RegCreateKeyExW(test_progid_key, DefaultIconW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &test_defaulticon_key, NULL); + ok(r == ERROR_SUCCESS, "RegCreateKeyExW(HKCR\\testfile\\DefaultIcon) failed: 0x%lx\n", r); + r = RegSetValueExW(test_defaulticon_key, NULL, 0, REG_SZ, (PBYTE)test_iconW, sizeof(test_iconW)); + ok(r == ERROR_SUCCESS, "RegSetValueExW(HKCR\\testfile\\DefaultIcon, NULL, \"folder.ico\") failed: 0x%lx\n", r); + getstring_test(test_extensionW, NULL, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); + getstring_test(test_progidW, NULL, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); + getstring_test(NULL, test_progid_key, ASSOCSTR_DEFAULTICON, test_iconW, __LINE__); + + RegDeleteKeyW(HKEY_CLASSES_ROOT, test_extensionW); + RegDeleteKeyW(HKEY_CLASSES_ROOT, test_progidW); + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr);

1 0

Detlef Riekenberg : kernelbase: Add dll with forwards to kernel32.dll.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 30686975a9ba7dee86bdeb18740d706909a3d509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30686975a9ba7dee86bdeb187… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 18 00:01:57 2016 +0100 kernelbase: Add dll with forwards to kernel32.dll. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 631 ++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 636 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30686975a9ba7dee86bde…

1 0

Bruno Jesus : comctl32/tests: Add initial tests for the animation control.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: bc357819296594aca300fdf30bb0cda46e9f0be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc357819296594aca300fdf30… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Mar 18 14:47:48 2016 +0530 comctl32/tests: Add initial tests for the animation control. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/animate.c | 185 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 1a4ce23..cb2fdf3 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = comctl32.dll IMPORTS = comctl32 ole32 user32 gdi32 advapi32 C_SRCS = \ + animate.c \ button.c \ comboex.c \ datetime.c \ diff --git a/dlls/comctl32/tests/animate.c b/dlls/comctl32/tests/animate.c new file mode 100644 index 0000000..b4218db --- /dev/null +++ b/dlls/comctl32/tests/animate.c @@ -0,0 +1,185 @@ +/* Unit tests for the animate control. + * + * Copyright 2016 Bruno Jesus + * + * 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 "wingdi.h" +#include "winuser.h" +#include "commctrl.h" + +#include "wine/test.h" + +#define SEARCHING_AVI_INDEX 151 /* From shell32 resource library */ +#define INVALID_AVI_INDEX 0xffff + +static HWND hAnimateParentWnd, hAnimateWnd; +static const char animateTestClass[] = "AnimateTestClass"; +static WNDPROC animate_wndproc; +static HANDLE shell32; + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + +static LRESULT CALLBACK animate_test_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) + { + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + return 0L; +} + +static void update_window(HWND hWnd) +{ + UpdateWindow(hWnd); + ok(!GetUpdateRect(hWnd, NULL, FALSE), "GetUpdateRect must return zero after UpdateWindow\n"); +} + +static void create_animate(DWORD parent_style, DWORD animate_style) +{ + WNDCLASSA wc; + RECT rect; + BOOL ret; + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = animateTestClass; + wc.lpfnWndProc = animate_test_wnd_proc; + RegisterClassA(&wc); + + rect.left = 0; + rect.top = 0; + rect.right = 200; + rect.bottom = 200; + ret = AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + ok(ret, "got %d\n", ret); + + hAnimateParentWnd = CreateWindowExA(0, animateTestClass, "Animate Test", WS_OVERLAPPEDWINDOW | parent_style, + CW_USEDEFAULT, CW_USEDEFAULT, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, GetModuleHandleA(NULL), 0); + ok(hAnimateParentWnd != NULL, "failed to create parent wnd\n"); + + GetClientRect(hAnimateParentWnd, &rect); + hAnimateWnd = CreateWindowExA(0, ANIMATE_CLASSA, NULL, WS_CHILD | WS_VISIBLE | animate_style, + 0, 0, rect.right, rect.bottom, hAnimateParentWnd, NULL, shell32, 0); + ok(hAnimateWnd != NULL, "failed to create parent wnd\n"); + animate_wndproc = (WNDPROC)SetWindowLongPtrA(hAnimateWnd, GWLP_WNDPROC, 0); + + ShowWindow(hAnimateParentWnd, SW_SHOWNORMAL); + ok(GetUpdateRect(hAnimateParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); + flush_events(); + update_window(hAnimateParentWnd); +} + +static void init(void) +{ + HMODULE hComctl32; + BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + + hComctl32 = GetModuleHandleA("comctl32.dll"); + pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); + if (pInitCommonControlsEx) + { + INITCOMMONCONTROLSEX iccex; + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_ANIMATE_CLASS; + pInitCommonControlsEx(&iccex); + } + else + InitCommonControls(); + + shell32 = LoadLibraryA("Shell32.dll"); +} + +static void destroy_animate(void) +{ + MSG msg; + + PostMessageA(hAnimateParentWnd, WM_CLOSE, 0, 0); + while (GetMessageA(&msg,0,0,0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + hAnimateParentWnd = NULL; +} + +static void cleanup(void) +{ + UnregisterClassA(animateTestClass, GetModuleHandleA(NULL)); +} + +static void test_play(void) +{ + LONG res; + DWORD err; + + create_animate(0, 0); + SetLastError(0xdeadbeef); + res = SendMessageA(hAnimateWnd, ACM_OPENA,(WPARAM)shell32, MAKEINTRESOURCE(INVALID_AVI_INDEX)); + err = GetLastError(); + ok(res == 0, "Invalid video should have failed\n"); + ok(err == ERROR_RESOURCE_NAME_NOT_FOUND, "Expected 1814, got %u\n", err); + + SetLastError(0xdeadbeef); + res = SendMessageA(hAnimateWnd, ACM_PLAY, (WPARAM) -1, MAKELONG(0, -1)); + ok(res == 0, "Play should have failed\n"); + ok(err == ERROR_RESOURCE_NAME_NOT_FOUND, "Expected 1814, got %u\n", err); + destroy_animate(); + + create_animate(0, 0); + res = SendMessageA(hAnimateWnd, ACM_OPENA,(WPARAM)shell32, MAKEINTRESOURCE(SEARCHING_AVI_INDEX)); + ok(res != 0, "Load AVI resource failed\n"); + res = SendMessageA(hAnimateWnd, ACM_PLAY, (WPARAM) -1, MAKELONG(0, -1)); + ok(res != 0, "Play should have worked\n"); + destroy_animate(); +} + +START_TEST(animate) +{ + init(); + + test_play(); + + cleanup(); +}

1 0

Hugh McMaster : kernel32: Add a stub for SetCurrentConsoleFontEx.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 408205cb0488a8ae6e8062691ec8eef8207da085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408205cb0488a8ae6e8062691… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 21 18:53:57 2016 +1100 kernel32: Add a stub for SetCurrentConsoleFontEx. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index b86cd8e..57c0b36 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3346,3 +3346,10 @@ BOOL WINAPI SetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) +{ + FIXME("(%p %d %p): stub!\n", hConsole, maxwindow, cfix); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9bb3181..d606d9b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1369,7 +1369,7 @@ @ stdcall SetConsoleTitleW(wstr) @ stdcall SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount -# @ stub SetCurrentConsoleFontEx +@ stdcall SetCurrentConsoleFontEx(long long ptr) @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) @ stub SetDaylightFlag

1 0

Rob Walker : wined3d: Add Nvidia GPU SKUs 950,950M,960,960M.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: e4c75a88fde88a1f7d1bca38a18eb91c80dbbd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c75a88fde88a1f7d1bca38a… Author: Rob Walker <bob.mt.wya(a)gmail.com> Date: Sat Mar 19 12:31:25 2016 +0000 wined3d: Add Nvidia GPU SKUs 950,950M,960,960M. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index da66aac..dd048fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1281,6 +1281,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960M, "NVIDIA GeForce GTX 960M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, @@ -1729,6 +1733,10 @@ cards_nvidia_binary[] = /* Direct 3D 11 */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ + {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ + {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ + {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ + {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a5feeb..99f2e53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1716,6 +1716,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, + CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, + CARD_NVIDIA_GEFORCE_GTX960 = 0x1401, + CARD_NVIDIA_GEFORCE_GTX960M = 0x139B, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8,

1 0

Józef Kucia : wined3d: Add extension detection for ARB_copy_buffer.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 6a5a51be1b57c804b1fb2894594e4798e852c79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5a51be1b57c804b1fb28945… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 20 23:15:25 2016 +0100 wined3d: Add extension detection for ARB_copy_buffer. 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/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dd048fd..be3fdb0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -109,6 +109,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, + {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, @@ -2499,6 +2500,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetFragDataIndex) /* GL_ARB_color_buffer_float */ USE_GL_FUNC(glClampColorARB) + /* GL_ARB_copy_buffer */ + USE_GL_FUNC(glCopyBufferSubData) /* GL_ARB_debug_output */ USE_GL_FUNC(glDebugMessageCallbackARB) USE_GL_FUNC(glDebugMessageControlARB) @@ -3452,6 +3455,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD * EXT_framebuffer_multisample and EXT_packed_depth_stencil * are integrated into ARB_framebuffer_object. */ + {ARB_COPY_BUFFER, MAKEDWORD_VERSION(3, 1)}, {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index e344ff1..8943cb0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -45,6 +45,7 @@ enum wined3d_gl_extension /* ARB */ ARB_BLEND_FUNC_EXTENDED, ARB_COLOR_BUFFER_FLOAT, + ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, ARB_DEPTH_TEXTURE,

1 0

Józef Kucia : wined3d: Implement copying of buffer resources.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 94039385f93bcebfbe7686446000dcea5c9c7230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94039385f93bcebfbe7686446… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 20 23:15:26 2016 +0100 wined3d: Implement copying of buffer resources. 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/wined3d/buffer.c | 86 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 9 +++++ dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1e66cae..70a7a20 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -42,9 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ -static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, UINT offset, UINT size) +static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned int offset, unsigned int size) { - if (!offset && !size) + if (!offset && (!size || size == buffer->resource.size)) goto invalidate_all; if (offset > buffer->resource.size || offset + size > buffer->resource.size) @@ -1113,6 +1113,88 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } +HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, + struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) +{ + BYTE *dst_buffer_mem, *src_buffer_mem, *dst_ptr, *src_ptr; + struct wined3d_bo_address dst_bo_address, src_bo_address; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct wined3d_device *device; + HRESULT hr; + + device = dst_buffer->resource.device; + + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + buffer_get_memory(dst_buffer, context, &dst_bo_address); + buffer_get_memory(src_buffer, context, &src_bo_address); + + dst_buffer_mem = dst_buffer->resource.heap_memory; + src_buffer_mem = src_buffer->resource.heap_memory; + + if (!dst_buffer_mem && !src_buffer_mem) + { + if (gl_info->supported[ARB_COPY_BUFFER]) + { + GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src_bo_address.buffer_object)); + GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst_bo_address.buffer_object)); + GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, src_offset, dst_offset, size)); + checkGLcall("direct buffer copy"); + } + else + { + if (FAILED(hr = wined3d_buffer_map(dst_buffer, dst_offset, size, &dst_ptr, 0))) + { + WARN("Failed to map dst_buffer, hr %#x.\n", hr); + context_release(context); + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = wined3d_buffer_map(src_buffer, src_offset, size, &src_ptr, WINED3D_MAP_READONLY))) + { + WARN("Failed to map src_buffer, hr %#x.\n", hr); + wined3d_buffer_unmap(dst_buffer); + context_release(context); + return WINED3DERR_INVALIDCALL; + } + + memcpy(dst_ptr, src_ptr, size); + + wined3d_buffer_unmap(src_buffer); + wined3d_buffer_unmap(dst_buffer); + } + } + else if (dst_buffer_mem && !src_buffer_mem) + { + if (src_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); + GL_EXTCALL(glBindBuffer(src_buffer->buffer_type_hint, src_bo_address.buffer_object)); + + GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst_buffer_mem + dst_offset)); + checkGLcall("buffer download"); + } + else if (!dst_buffer_mem && src_buffer_mem) + { + if (dst_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); + GL_EXTCALL(glBindBuffer(dst_buffer->buffer_type_hint, dst_bo_address.buffer_object)); + + GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src_buffer_mem + src_offset)); + checkGLcall("buffer upload"); + } + else + { + memcpy(dst_buffer_mem + dst_offset, src_buffer_mem + src_offset, size); + } + + if (dst_buffer_mem) + buffer_invalidate_bo_range(dst_buffer, dst_offset, size); + + context_release(context); + return WINED3D_OK; +} + HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e428a79..bfbef48 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3865,6 +3865,15 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } + if (dst_resource->type == WINED3D_RTYPE_BUFFER) + { + if (FAILED(hr = wined3d_buffer_copy(buffer_from_resource(dst_resource), 0, + buffer_from_resource(src_resource), 0, + dst_resource->size))) + ERR("Failed to copy buffer, hr %#x.\n", hr); + return; + } + if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 99f2e53..3dea1e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,6 +2903,8 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *con void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, + struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Add support for buffers in wined3d_device_copy_sub_resource().
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 33e786565c9939e8efef073f564af7f7ed1d7c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e786565c9939e8efef073f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 20 23:15:27 2016 +0100 wined3d: Add support for buffers in wined3d_device_copy_sub_resource(). 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/wined3d/device.c | 58 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bfbef48..5a523d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3922,6 +3922,14 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev device, dst_resource, dst_sub_resource_idx, dst_x, dst_y, dst_z, src_resource, src_sub_resource_idx, debug_box(src_box)); + if (src_box && (src_box->left >= src_box->right + || src_box->top >= src_box->bottom + || src_box->front >= src_box->back)) + { + WARN("Invalid box %s specified.\n", debug_box(src_box)); + return WINED3DERR_INVALIDCALL; + } + if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx) { WARN("Source and destination are the same sub-resource.\n"); @@ -3944,6 +3952,46 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } + if (dst_resource->type == WINED3D_RTYPE_BUFFER) + { + unsigned int src_offset, size; + + if (dst_sub_resource_idx) + { + WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); + return WINED3DERR_INVALIDCALL; + } + if (src_sub_resource_idx) + { + WARN("Invalid src_sub_resource_idx %u.\n", src_sub_resource_idx); + return WINED3DERR_INVALIDCALL; + } + + if (src_box) + { + src_offset = src_box->left; + size = src_box->right - src_box->left; + } + else + { + src_offset = 0; + size = src_resource->size; + } + + if (src_offset > src_resource->size + || size > src_resource->size - src_offset + || dst_x > dst_resource->size + || size > dst_resource->size - dst_x) + { + WARN("Invalid range specified, dst_offset %u, src_offset %u, size %u.\n", + dst_x, src_offset, size); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_buffer_copy(buffer_from_resource(dst_resource), dst_x, + buffer_from_resource(src_resource), src_offset, size); + } + if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); @@ -3967,19 +4015,9 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev src_surface = surface_from_resource(tmp); if (src_box) - { - if (src_box->front >= src_box->back) - { - WARN("Invalid box %s specified.\n", debug_box(src_box)); - return WINED3DERR_INVALIDCALL; - } - SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); - } else - { SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); - } SetRect(&dst_rect, dst_x, dst_y, dst_x + (src_rect.right - src_rect.left), dst_y + (src_rect.bottom - src_rect.top));

1 0

Alexandre Julliard : winebuild: Use strarray objects instead of pointers where possible.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 8baaf5349f5cfb01ea78c5d7b0592d4ae674caf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8baaf5349f5cfb01ea78c5d7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 19 13:10:09 2016 +0900 winebuild: Use strarray objects instead of pointers where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 19 ++++----- tools/winebuild/import.c | 19 ++++----- tools/winebuild/main.c | 8 ++-- tools/winebuild/res32.c | 7 ++- tools/winebuild/utils.c | 108 +++++++++++++++++++++-------------------------- 5 files changed, 73 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8baaf5349f5cfb01ea78c…

1 0

Alexandre Julliard : winebuild: Use strarray objects for a few more string arrays.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: d65446af3db98499a43fc8dd856cc1f404424b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65446af3db98499a43fc8dd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 19 13:22:30 2016 +0900 winebuild: Use strarray objects for a few more string arrays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 3 +-- tools/winebuild/import.c | 68 +++++++++++++++++------------------------------- tools/winebuild/main.c | 20 ++++++-------- tools/winebuild/utils.c | 14 +++------- 4 files changed, 36 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d65446af3db98499a43fc…

1 0