November 2015 - Wine-Commits

Martin Storsjo : msvcrt: Don't lock the heap in operator_new.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 91ed0d7963cec57c3680115743939ba641ae570a URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ed0d7963cec57c368011574… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Nov 6 14:51:56 2015 +0200 msvcrt: Don't lock the heap in operator_new. The native msvcrt/msvcp allow two threads to be calling the new handler simultaneously. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 02e69fe..a908846 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -131,6 +131,7 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; + MSVCRT_new_handler_func handler; do { @@ -141,12 +142,11 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) return retval; } - LOCK_HEAP; - if(MSVCRT_new_handler) - freed = (*MSVCRT_new_handler)(size); + handler = MSVCRT_new_handler; + if(handler) + freed = (*handler)(size); else freed = 0; - UNLOCK_HEAP; } while(freed); TRACE("(%ld) out of memory\n", size);

1 0

Martin Storsjo : msvcrt: Pass on the return value in _callnewh.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: e66758dd531646aa6707c71f7e6f23ffec4cb1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66758dd531646aa6707c71f7… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Nov 6 14:51:55 2015 +0200 msvcrt: Pass on the return value in _callnewh. Also try to avoid race conditions by storing the new handler in a local variable before checking whether it's non-null. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index bb265bf..02e69fe 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -234,9 +234,11 @@ int CDECL MSVCRT__set_new_mode(int mode) */ int CDECL _callnewh(MSVCRT_size_t size) { - if(MSVCRT_new_handler) - (*MSVCRT_new_handler)(size); - return 0; + int ret = 0; + MSVCRT_new_handler_func handler = MSVCRT_new_handler; + if(handler) + ret = (*handler)(size) ? 1 : 0; + return ret; } /*********************************************************************

1 0

Jacek Caban : urlmon: Include 'x64' token in user agent string on win64.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: eb5f7531ac489a31d24fee538b0dc208e453d576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5f7531ac489a31d24fee538… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 11:09:11 2015 +0100 urlmon: Include 'x64' token in user agent string on win64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index d2e83fa..1df483f 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -555,7 +555,7 @@ static void ensure_useragent(void) '\\','5','.','0','\\','U','s','e','r',' ','A','g','e','n','t', '\\','P','o','s','t',' ','P','l','a','t','f','o','r','m',0}; static const WCHAR ntW[] = {'N','T',' ',0}; - static const WCHAR win64W[] = {'W','i','n','6','4',';',' ',0}; + static const WCHAR win64W[] = {'W','i','n','6','4',';',' ','x','6','4',';',' ',0}; static const WCHAR wow64W[] = {'W','O','W','6','4',';',' ',0}; static const WCHAR emptyW[] = {0};

1 0

Dmitry Timoshkov : taskschd/tests: Fix memory leaks (Valgrind).
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 557c3714e80c70b0d7140349e8ad330aa86e0eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=557c3714e80c70b0d7140349e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 9 12:22:27 2015 +0800 taskschd/tests: Fix memory leaks (Valgrind). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 2 +- dlls/taskschd/tests/scheduler.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 5a7ade8..c33cda1 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2611,8 +2611,8 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); if (hr != RPC_S_OK) return hr; hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); - if (hr != RPC_S_OK) return hr; RpcStringFreeW(&binding_str); + if (hr != RPC_S_OK) return hr; /* Make sure that the connection works */ hr = SchRpcHighestVersion(&task_svc->version); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9a745b8..60a6c94 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -782,6 +782,7 @@ static void test_GetTask(void) { hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); + IRegisteredTask_Release(task1); } } @@ -809,8 +810,10 @@ todo_wine for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) { - hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, open_existing_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, open_existing_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); + if (hr == S_OK) + IRegisteredTask_Release(task2); } hr = IRegisteredTask_get_Name(task1, NULL); @@ -944,6 +947,7 @@ todo_wine ok(hr == S_OK, "get_Name error %#x\n", hr); hr = IIDFromString(bstr, &iid); ok(hr == S_OK, "IIDFromString error %#x\n", hr); + SysFreeString(bstr); IRegisteredTask_Release(task1); @@ -1006,7 +1010,10 @@ static void test_settings_v1(ITaskDefinition *taskdef, struct settings *test, st if (!def->restart_interval[0]) ok(bstr == NULL, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); else + { ok(!lstrcmpW(bstr, def->restart_interval), "expected %s, got %s\n", wine_dbgstr_w(def->restart_interval), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } hr = ITaskSettings_get_RestartCount(set, &vint); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); @@ -1052,7 +1059,10 @@ static void test_settings_v1(ITaskDefinition *taskdef, struct settings *test, st if (!test->delete_expired_task_after[0]) ok(bstr == NULL, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); else + { ok(!lstrcmpW(bstr, test->delete_expired_task_after), "expected %s, got %s\n", wine_dbgstr_w(test->delete_expired_task_after), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } hr = ITaskSettings_get_Priority(set, &vint); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); @@ -1094,7 +1104,11 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ - if (hr != S_OK) return; + if (hr != S_OK) + { + ITaskSettings_Release(set); + return; + } hr = ITaskSettings_put_RestartCount(set, test->restart_count); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Józef Kucia : include: Add some missing D3D11 constants.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 905b579743523d8fe861eb939eabf8cbf12f363e URL: http://source.winehq.org/git/wine.git/?a=commit;h=905b579743523d8fe861eb939… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 17:32:20 2015 +0100 include: Add some missing D3D11 constants. 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> --- include/d3d11.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index cf8d93d..605befd 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -87,12 +87,17 @@ const UINT D3D11_DEFAULT_VIEWPORT_WIDTH = 0; cpp_quote("#define D3D11_FLOAT32_MAX (3.402823466e+38f)") +const UINT D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; + const unsigned int D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; const UINT D3D11_MAX_MAXANISOTROPY = 16; const UINT D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT = 32; const UINT D3D11_VIEWPORT_BOUNDS_MAX = 32767; const INT D3D11_VIEWPORT_BOUNDS_MIN = -32768; +const UINT D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX = 15; +const UINT D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; + const UINT D3D11_SHADER_MAJOR_VERSION = 5; const UINT D3D11_SHADER_MAX_INSTANCES = 65535; const UINT D3D11_SHADER_MAX_INTERFACES = 253;

1 0

Alexandre Julliard : kernel32/tests: Fix some todo tests that succeed or fail depending on the kernel version.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 3b7cdc0b8475f4eac910c5260c96c381ddbb630e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7cdc0b8475f4eac910c5260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 9 14:26:48 2015 +0900 kernel32/tests: Fix some todo tests that succeed or fail depending on the kernel version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b115ed8..ae09ef6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -294,11 +294,14 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { - todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); + /* currently the Wine behavior depends on the kernel version */ + /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); */ + if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek3 got %d bytes\n", readden); } else { - ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + /* ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); */ + if (readden != sizeof(obuf)) todo_wine ok(0, "peek3 got %d bytes\n", readden); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; @@ -322,11 +325,14 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf2), "write file len 4b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { - todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); + /* currently the Wine behavior depends on the kernel version */ + /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); */ + if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek4 got %d bytes\n", readden); } else { - ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + /* ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); */ + if (readden != sizeof(obuf)) todo_wine ok(0, "peek4 got %d bytes\n", readden); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; @@ -367,7 +373,10 @@ static void test_CreateNamedPipe(int pipemode) ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); - ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + /* currently the Wine behavior depends on the kernel version */ + /* ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); */ + if (readden != sizeof(obuf)) todo_wine ok(0, "peek5 got %d bytes\n", readden); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); @@ -399,7 +408,10 @@ static void test_CreateNamedPipe(int pipemode) ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile6b\n"); ok(written == sizeof(obuf2), "write file len 6b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n"); - ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + /* currently the Wine behavior depends on the kernel version */ + /* ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); */ + if (readden != sizeof(obuf)) todo_wine ok(0, "peek6 got %d bytes\n", readden); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 6a check\n");

1 0

Alexandre Julliard : d2d1: Avoid an unsupported makefile variable assignment.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: f13245295d151aff97cb70a5a06cb79a07fe7910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13245295d151aff97cb70a5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 9 11:47:38 2015 +0900 d2d1: Avoid an unsupported makefile variable assignment. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 9768a4f..8a6618d 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -2,7 +2,6 @@ MODULE = d2d1.dll IMPORTLIB = d2d1 IMPORTS = d3d10_1 dxguid uuid DELAYIMPORTS = dwrite -CFLAGS += $(EXCESS_PRECISION_CFLAGS) C_SRCS = \ bitmap.c \ @@ -16,3 +15,5 @@ C_SRCS = \ wic_render_target.c RC_SRCS = version.rc + +geometry_EXTRADEFS = $(EXCESS_PRECISION_CFLAGS)

1 0

Alexandre Julliard : makefiles: Only set the manpage flag for programs.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: d9e9599310fcab7f6009c9790361a04ee8c82133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e9599310fcab7f6009c9790… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 8 14:07:39 2015 +0900 makefiles: Only set the manpage flag for programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 18 +++++++++--------- configure.ac | 18 +++++++++--------- tools/make_makefiles | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 6da7b76..08f1ec1 100755 --- a/configure +++ b/configure @@ -18147,7 +18147,7 @@ wine_fn_config_makefile include enable_include clean,install-dev wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine clean,config,install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp -wine_fn_config_makefile loader enable_loader clean,config,install-lib,manpage +wine_fn_config_makefile loader enable_loader clean,config,install-lib wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install,po @@ -18239,16 +18239,16 @@ wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test -wine_fn_config_makefile server enable_server clean,install-lib,manpage +wine_fn_config_makefile server enable_server clean,install-lib wine_fn_config_tool tools clean wine_fn_config_tool tools/sfnt2fon clean -wine_fn_config_tool tools/widl clean,install-dev,manpage -wine_fn_config_tool tools/winebuild clean,install-dev,manpage -wine_fn_config_tool tools/winedump clean,install-dev,manpage -wine_fn_config_tool tools/winegcc clean,install-dev,manpage -wine_fn_config_tool tools/winemaker install-dev,manpage -wine_fn_config_tool tools/wmc clean,install-dev,manpage -wine_fn_config_tool tools/wrc clean,install-dev,manpage +wine_fn_config_tool tools/widl clean,install-dev +wine_fn_config_tool tools/winebuild clean,install-dev +wine_fn_config_tool tools/winedump clean,install-dev +wine_fn_config_tool tools/winegcc clean,install-dev +wine_fn_config_tool tools/winemaker clean,install-dev +wine_fn_config_tool tools/wmc clean,install-dev +wine_fn_config_tool tools/wrc clean,install-dev LINGUAS="\ ar \ diff --git a/configure.ac b/configure.ac index 68fd411..c514192 100644 --- a/configure.ac +++ b/configure.ac @@ -3501,7 +3501,7 @@ WINE_CONFIG_MAKEFILE([include],,[clean,install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[clean,config,install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) -WINE_CONFIG_MAKEFILE([loader],,[clean,config,install-lib,manpage]) +WINE_CONFIG_MAKEFILE([loader],,[clean,config,install-lib]) WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[install,po]) @@ -3593,16 +3593,16 @@ WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) -WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) +WINE_CONFIG_MAKEFILE([server],,[clean,install-lib]) WINE_CONFIG_TOOL(tools,[clean]) WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) -WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winemaker,[install-dev,manpage]) -WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev,manpage]) +WINE_CONFIG_TOOL(tools/widl,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winemaker,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev]) AC_SUBST([LINGUAS],["\ ar \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 28e448a..3c14751 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -373,7 +373,7 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.man\.in$/) { push @{${$make}{"=MANPAGES"}}, $name; - ${${$make}{"=flags"}}{"manpage"} = 1; + ${${$make}{"=flags"}}{($file =~ /^programs\//) ? "manpage" : "clean"} = 1; } elsif ($name =~ /\.in$/) {

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSSetSamplers().
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: f175b236655ac690ebc0e2698754fade1047d251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f175b236655ac690ebc0e2698… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:10 2015 +0100 d3d11: Implement d3d11_immediate_context_PSSetSamplers(). 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/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 15 ++++++++++++++- dlls/d3d11/state.c | 9 +++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 2ac6129..c680249 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -352,6 +352,7 @@ struct d3d_sampler_state HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, const D3D11_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; +struct d3d_sampler_state *unsafe_impl_from_ID3D11SamplerState(ID3D11SamplerState *iface) DECLSPEC_HIDDEN; struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D11Query, ID3D10Query */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 566cd16..c44ec4a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -164,8 +164,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_ps_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index b412ed6..3ec9b1f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1221,6 +1221,15 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic return S_OK; } +struct d3d_sampler_state *unsafe_impl_from_ID3D11SamplerState(ID3D11SamplerState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_sampler_state_vtbl); + + return impl_from_ID3D11SamplerState(iface); +} + struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_Draw().
by Alexandre Julliard Nov. 6, 2015

Nov. 6, 2015

Module: wine Branch: master Commit: 680b67e4090e4ee1d6e1d61f1e7c6d1a80702623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=680b67e4090e4ee1d6e1d61f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 01:28:23 2015 +0100 d3d11: Implement d3d11_immediate_context_Draw(). 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/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4560f52..5e9e26d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -195,8 +195,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext *iface, UINT vertex_count, UINT start_vertex_location) { - FIXME("iface %p, vertex_count %u, start_vertex_location %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, vertex_count %u, start_vertex_location %u.\n", iface, vertex_count, start_vertex_location); + + wined3d_mutex_lock(); + wined3d_device_draw_primitive(device->wined3d_device, start_vertex_location, vertex_count); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource,

1 0