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

Sebastian Lackner : services: Introduce refcounting for processes.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 6617ff24f206335d595c585b96289542ead9cbe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6617ff24f206335d595c585b9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:31:31 2016 +0100 services: Introduce refcounting for processes. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 9 ++++++++- programs/services/services.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 03df852..1119b25 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -73,6 +73,7 @@ static DWORD process_create(struct process_entry **entry) *entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**entry)); if (!*entry) return ERROR_NOT_ENOUGH_SERVER_MEMORY; + (*entry)->ref_count = 1; (*entry)->control_pipe = INVALID_HANDLE_VALUE; /* all other fields are zero */ return ERROR_SUCCESS; @@ -126,7 +127,7 @@ void free_service_entry(struct service_entry *entry) HeapFree(GetProcessHeap(), 0, entry->description); HeapFree(GetProcessHeap(), 0, entry->dependOnServices); HeapFree(GetProcessHeap(), 0, entry->dependOnGroups); - free_process_entry(entry->process); + release_process(entry->process); HeapFree(GetProcessHeap(), 0, entry); } @@ -455,6 +456,12 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase return NULL; } +void release_process(struct process_entry *process) +{ + if (InterlockedDecrement(&process->ref_count) == 0) + free_process_entry(process); +} + void release_service(struct service_entry *service) { struct scmdatabase *db = service->db; diff --git a/programs/services/services.h b/programs/services/services.h index 206d655..b8f4774 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -33,6 +33,7 @@ struct scmdatabase struct process_entry { + LONG ref_count; HANDLE process; HANDLE control_mutex; HANDLE control_pipe; @@ -87,6 +88,7 @@ void service_terminate(struct service_entry *service); /* Process functions */ +void release_process(struct process_entry *process); BOOL process_send_command(struct process_entry *process, const void *data, DWORD size, DWORD *result); extern HANDLE g_hStartedEvent;

1 0

Sebastian Lackner : services: Pass a process argument to send_start_message function.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 7e2176459da316347dd1a62b4bab974258513f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2176459da316347dd1a62b4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:32:08 2016 +0100 services: Pass a process argument to send_start_message function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1119b25..325e7f3 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -799,19 +799,18 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL } /****************************************************************************** - * service_send_start_message + * process_send_start_message */ -static BOOL service_send_start_message(struct service_entry *service, HANDLE process_handle, +static BOOL process_send_start_message(struct process_entry *process, const WCHAR *name, LPCWSTR *argv, DWORD argc) { - struct process_entry *process = service->process; OVERLAPPED overlapped; DWORD i, len, result; service_start_info *ssi; LPWSTR p; BOOL r; - WINE_TRACE("%s %p %d\n", wine_dbgstr_w(service->name), argv, argc); + WINE_TRACE("%p %s %p %d\n", process, wine_dbgstr_w(name), argv, argc); overlapped.hEvent = process->overlapped_event; if (!ConnectNamedPipe(process->control_pipe, &overlapped)) @@ -820,12 +819,12 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro { HANDLE handles[2]; handles[0] = process->overlapped_event; - handles[1] = process_handle; + handles[1] = process->process; if (WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ) != WAIT_OBJECT_0) CancelIo(process->control_pipe); if (!HasOverlappedIoCompleted( &overlapped )) { - WINE_ERR( "service %s failed to start\n", wine_dbgstr_w( service->name )); + WINE_ERR("service %s failed to start\n", wine_dbgstr_w(name)); return FALSE; } } @@ -837,7 +836,7 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro } /* calculate how much space do we need to send the startup info */ - len = strlenW(service->name) + 1; + len = strlenW(name) + 1; for (i=0; i<argc; i++) len += strlenW(argv[i])+1; len++; @@ -846,8 +845,8 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro ssi->cmd = WINESERV_STARTINFO; ssi->control = 0; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); - ssi->name_size = strlenW(service->name) + 1; - strcpyW( ssi->data, service->name ); + ssi->name_size = strlenW(name) + 1; + strcpyW(ssi->data, name); /* copy service args into a single buffer*/ p = &ssi->data[ssi->name_size]; @@ -911,7 +910,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * err = service_start_process(service, &process_handle); if (err == ERROR_SUCCESS) { - if (!service_send_start_message(service, process_handle, service_argv, service_argc)) + if (!process_send_start_message(process, service->name, service_argv, service_argc)) err = ERROR_SERVICE_REQUEST_TIMEOUT; }

1 0

Sebastian Lackner : services: Pass a process argument to send_control function.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: fa593d4d87ca2938ef706a5a782744e38738eae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa593d4d87ca2938ef706a5a7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:32:34 2016 +0100 services: Pass a process argument to send_control function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index cdac948..59bbe7f 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1035,25 +1035,25 @@ BOOL process_send_command(struct process_entry *process, const void *data, DWORD } /****************************************************************************** - * service_send_control + * process_send_control */ -static BOOL service_send_control(struct service_entry *service, DWORD dwControl, DWORD *result) +static BOOL process_send_control(struct process_entry *process, const WCHAR *name, DWORD dwControl, DWORD *result) { service_start_info *ssi; DWORD len; BOOL r; /* calculate how much space we need to send the startup info */ - len = strlenW(service->name) + 1; + len = strlenW(name) + 1; ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, data[len])); ssi->cmd = WINESERV_SENDCONTROL; ssi->control = dwControl; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); - ssi->name_size = strlenW(service->name) + 1; - strcpyW( ssi->data, service->name ); + ssi->name_size = strlenW(name) + 1; + strcpyW(ssi->data, name); - r = process_send_command(service->process, ssi, ssi->total_size, result); + r = process_send_command(process, ssi, ssi->total_size, result); HeapFree( GetProcessHeap(), 0, ssi ); return r; } @@ -1176,7 +1176,7 @@ DWORD __cdecl svcctl_ControlService( if (ret != WAIT_OBJECT_0) return ERROR_SERVICE_REQUEST_TIMEOUT; - service_send_control(service->service_entry, dwControl, &result); + process_send_control(service->service_entry->process, service->service_entry->name, dwControl, &result); if (lpServiceStatus) {

1 0

Sebastian Lackner : services: Pass a process argument to wait_for_startup function.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: ed54b881738c616674d7025b32f704a159decd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed54b881738c616674d7025b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:33:09 2016 +0100 services: Pass a process argument to wait_for_startup function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 47 ++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 325e7f3..8f53e7e 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -714,7 +714,7 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, return ERROR_SUCCESS; } -static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +static DWORD service_start_process(struct service_entry *service_entry) { PROCESS_INFORMATION pi; STARTUPINFOW si; @@ -765,37 +765,30 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * service_entry->status.dwProcessId = pi.dwProcessId; service_entry->process->process = pi.hProcess; - *process = pi.hProcess; CloseHandle( pi.hThread ); return ERROR_SUCCESS; } -static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDLE process_handle) +static DWORD process_wait_for_startup(struct process_entry *process) { - HANDLE handles[2] = { service_entry->process->status_changed_event, process_handle }; - DWORD state, ret; - - WINE_TRACE("%p\n", service_entry); + HANDLE handles[2] = { process->status_changed_event, process->process }; + DWORD ret; ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); - if (ret != WAIT_OBJECT_0) - return ERROR_SERVICE_REQUEST_TIMEOUT; - service_lock(service_entry); - state = service_entry->status.dwCurrentState; - service_unlock(service_entry); - if (state == SERVICE_START_PENDING) - { - WINE_TRACE("Service state changed to SERVICE_START_PENDING\n"); - return ERROR_SUCCESS; - } - else if (state == SERVICE_RUNNING) - { - WINE_TRACE("Service started successfully\n"); - return ERROR_SUCCESS; - } + return (ret == WAIT_OBJECT_0) ? ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; +} + +static DWORD service_is_running(struct service_entry *service) +{ + DWORD state; + + service_lock(service); + state = service->status.dwCurrentState; + service_unlock(service); - return ERROR_SERVICE_REQUEST_TIMEOUT; + return (state == SERVICE_START_PENDING || state == SERVICE_RUNNING) ? + ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; } /****************************************************************************** @@ -874,7 +867,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * struct process_entry *process = service->process; DWORD err; LPWSTR name; - HANDLE process_handle = NULL; err = scmdatabase_lock_startup(service->db); if (err != ERROR_SUCCESS) @@ -907,7 +899,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * } else { - err = service_start_process(service, &process_handle); + err = service_start_process(service); if (err == ERROR_SUCCESS) { if (!process_send_start_message(process, service->name, service_argv, service_argc)) @@ -915,7 +907,10 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * } if (err == ERROR_SUCCESS) - err = service_wait_for_startup(service, process_handle); + err = process_wait_for_startup(process); + + if (err == ERROR_SUCCESS) + err = service_is_running(service); } if (err == ERROR_SUCCESS)

1 0

Sebastian Lackner : setupapi: Fix parsing of inf files containing garbage at the beginning of the file.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: e8aa851fe438a2c5e254879fe6170df7866b98c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8aa851fe438a2c5e254879fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 05:34:14 2016 +0100 setupapi: Fix parsing of inf files containing garbage at the beginning of the file. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 14 +++++++++++++- dlls/setupapi/tests/parser.c | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index e8c8fd3..5cc3ef5 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -114,6 +114,7 @@ struct parser int cur_section; /* index of section being parsed*/ struct line *line; /* current line */ unsigned int line_pos; /* current line position in file */ + unsigned int broken_line; /* first line containing invalid data (if any) */ unsigned int error; /* error code */ unsigned int token_len; /* current token len */ WCHAR token[MAX_FIELD_LEN+1]; /* current token */ @@ -600,12 +601,15 @@ static const WCHAR *line_start_state( struct parser *parser, const WCHAR *pos ) set_state( parser, SECTION_NAME ); return p + 1; default: - if (!isspaceW(*p)) + if (isspaceW(*p)) break; + if (parser->cur_section != -1) { parser->start = p; set_state( parser, KEY_NAME ); return p; } + if (!parser->broken_line) + parser->broken_line = parser->line_pos; break; } } @@ -886,6 +890,7 @@ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCH parser.stack_pos = 0; parser.cur_section = -1; parser.line_pos = 1; + parser.broken_line = 0; parser.error = 0; parser.token_len = 0; @@ -916,6 +921,13 @@ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCH /* find the [strings] section */ file->strings_section = find_section( file, Strings ); + + if (file->strings_section == -1 && parser.broken_line) + { + if (error_line) *error_line = parser.broken_line; + return ERROR_EXPECTED_SECTION_NAME; + } + return 0; } diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index f929f01..67c9887 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -133,6 +133,18 @@ static const struct { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { "garbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { "garbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { ";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { ";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { " \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { " \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { "garbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { "garbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, + { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, + { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, }; static void test_invalid_files(void)

1 0

Alexandre Julliard : vssapi: Undefine __thiscall before redefining it.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 71d9791e1c85a35b2f96f1eb4ccf04487794046f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d9791e1c85a35b2f96f1eb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 16:09:41 2016 +0900 vssapi: Undefine __thiscall before redefining it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vssapi/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 133f4c5..9234544 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func

1 0

Matteo Bruni : d3d10core: Add feature level support.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: fcc8553d8b8075542cd3edf26276c1915d29b0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc8553d8b8075542cd3edf26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:24:10 2016 +0100 d3d10core: Add feature level support. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 2 +- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10_1/d3d10_1_main.c | 6 ++---- dlls/d3d10_1/tests/d3d10_1.c | 4 ++-- dlls/d3d10core/d3d10core.spec | 2 +- dlls/d3d10core/d3d10core_main.c | 11 +++++------ 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4600a70..e36ec51 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -117,7 +117,7 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } } - hr = D3D10CoreCreateDevice(factory, adapter, flags, NULL, device); + hr = D3D10CoreCreateDevice(factory, adapter, flags, D3D_FEATURE_LEVEL_10_0, device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index dbd72ba..232399f 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -268,7 +268,7 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d /* D3D10Core */ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device); + unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index 1f35c43..e9fad3e 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device); + unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device); #define WINE_D3D10_TO_STR(x) case x: return #x @@ -161,9 +161,7 @@ HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive } } - FIXME("Ignoring feature level %s.\n", debug_d3d10_feature_level(hw_level)); - - hr = D3D10CoreCreateDevice(factory, adapter, flags, NULL, (ID3D10Device **)device); + hr = D3D10CoreCreateDevice(factory, adapter, flags, hw_level, (ID3D10Device **)device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index ccea06b..f7d188d 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -82,7 +82,7 @@ static void test_create_device(void) } feature_level = ID3D10Device1_GetFeatureLevel(device); - todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); ID3D10Device1_Release(device); @@ -165,7 +165,7 @@ static void test_create_device(void) ok(!refcount, "Swapchain has %u references left.\n", refcount); feature_level = ID3D10Device1_GetFeatureLevel(device); - todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); refcount = ID3D10Device1_Release(device); diff --git a/dlls/d3d10core/d3d10core.spec b/dlls/d3d10core/d3d10core.spec index 6569888..9bf25b5 100644 --- a/dlls/d3d10core/d3d10core.spec +++ b/dlls/d3d10core/d3d10core.spec @@ -1,2 +1,2 @@ -@ stdcall D3D10CoreCreateDevice(ptr ptr long ptr ptr) +@ stdcall D3D10CoreCreateDevice(ptr ptr long long ptr) @ stdcall D3D10CoreRegisterLayers() diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 44f1e29..d364be9 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -26,8 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, - const D3D_FEATURE_LEVEL *feature_levels, UINT levels, ID3D11Device **device); +HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, ID3D11Device **device); HRESULT WINAPI D3D10CoreRegisterLayers(void) { @@ -37,14 +37,13 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void) } HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device) + unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device) { - D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_10_0; ID3D11Device *device11; HRESULT hr; - TRACE("factory %p, adapter %p, flags %#x, unknown0 %p, device %p.\n", - factory, adapter, flags, unknown0, device); + TRACE("factory %p, adapter %p, flags %#x, feature_level %#x, device %p.\n", + factory, adapter, flags, feature_level, device); if (FAILED(hr = D3D11CoreCreateDevice(factory, adapter, flags, &feature_level, 1, &device11))) return hr;

1 0

Matteo Bruni : wined3d: Enable SM5 shaders in the GLSL backend, when possible.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 64d16294bf69913315fb0470ecaf44ffee76c933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d16294bf69913315fb0470e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:24:11 2016 +0100 wined3d: Enable SM5 shaders in the GLSL backend, when possible. Signed-off-by: Matteo Bruni <mbruni(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 | 2 ++ dlls/wined3d/glsl_shader.c | 8 +++++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e484cc6..da66aac 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3588,6 +3588,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; if (gl_version >= MAKEDWORD_VERSION(3, 2)) gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; + if (gl_version >= MAKEDWORD_VERSION(4, 3)) + gl_info->supported[WINED3D_GL_VERSION_4_3] = TRUE; if (gl_info->supported[APPLE_FENCE]) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 136bd55..92a5b1c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8005,7 +8005,13 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s { UINT shader_model; - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] + /* FIXME: Check for the specific extensions required for SM5 support + * (ARB_compute_shader, ARB_tessellation_shader, ARB_gpu_shader5, ...) as + * soon as we introduce them, adjusting the GL / GLSL version checks + * accordingly. */ + if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3]) + shader_model = 5; + else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a59c847..e344ff1 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -171,6 +171,7 @@ enum wined3d_gl_extension WINED3D_GL_LEGACY_CONTEXT, WINED3D_GL_VERSION_2_0, WINED3D_GL_VERSION_3_2, + WINED3D_GL_VERSION_4_3, WINED3D_GL_EXT_COUNT, };

1 0

Matteo Bruni : d3d11/tests: Add a feature_level parameter to init_test_context().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: dd72b43ae5db6d61f227ad38d9f595f7a3e131f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd72b43ae5db6d61f227ad38d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:24:12 2016 +0100 d3d11/tests: Add a feature_level parameter to init_test_context(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 636bec9..4982ebc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -320,15 +320,16 @@ struct d3d11_test_context ID3D11Buffer *vb; }; -#define init_test_context(c) init_test_context_(__LINE__, c) -static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *context) +#define init_test_context(c, l) init_test_context_(__LINE__, c, l) +static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *context, + const D3D_FEATURE_LEVEL *feature_level) { D3D11_VIEWPORT vp; HRESULT hr; memset(context, 0, sizeof(*context)); - if (!(context->device = create_device(NULL))) + if (!(context->device = create_device(feature_level))) { skip_(__FILE__, line)("Failed to create device.\n"); return FALSE; @@ -3187,7 +3188,7 @@ static void test_blend(void) static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -3756,7 +3757,7 @@ static void test_texture(void) {&ps_sample_l, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 2.0f, 2.0f, 9.0f, level_2_colors}, }; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4109,7 +4110,7 @@ static void test_scissor(void) 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4309,7 +4310,7 @@ static void test_il_append_aligned(void) }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4445,7 +4446,7 @@ static void test_fragment_coords(void) static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; struct vec4 cutoff = {320.0f, 240.0f, 0.0f, 0.0f}; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4577,7 +4578,7 @@ static void test_update_subresource(void) 0xff000000, 0xff7f7f7f, 0xffffffff, 0x00000000, }; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -4746,7 +4747,7 @@ static void test_copy_subresource_region(void) 0xffffffff, 0xffffffff, 0xff000000, 0x00000000, }; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device; @@ -5014,7 +5015,7 @@ static void test_multisample_init(void) UINT count = 0; HRESULT hr; - if (!init_test_context(&test_context)) + if (!init_test_context(&test_context, NULL)) return; device = test_context.device;

1 0

Matteo Bruni : d3d11/tests: Test relative addressing in constant buffers.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 3a8d3fb13cffb9815e826f9b9f123cc093d3924c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8d3fb13cffb9815e826f9b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:24:13 2016 +0100 d3d11/tests: Test relative addressing in constant buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4982ebc..81cb87f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5208,6 +5208,204 @@ static void test_clear_depth_stencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_cb_relative_addressing(void) +{ + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + ID3D11Buffer *colors_cb, *index_cb; + unsigned int i, index[4] = {0}; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + DWORD color; + HRESULT hr; + + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 +int color_index; + +cbuffer colors +{ + float4 colors[8]; +}; + +struct vs_in +{ + float4 position : POSITION; +}; + +struct vs_out +{ + float4 position : SV_POSITION; + float4 color : COLOR; +}; + +vs_out main(const vs_in v) +{ + vs_out o; + + o.position = v.position; + o.color = colors[color_index]; + + return o; +} +#endif + 0x43425844, 0xc2eb30bf, 0x2868c855, 0xaa34b609, 0x1f4957d4, 0x00000001, 0x00000164, 0x00000003, + 0x0000002c, 0x00000060, 0x000000b4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x58454853, 0x000000a8, 0x00010050, + 0x0000002a, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000859, 0x00208e46, + 0x00000001, 0x00000008, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x06000036, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x07000036, 0x001020f2, 0x00000001, 0x04208e46, 0x00000001, 0x0010000a, 0x00000000, + 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 +struct ps_in +{ + float4 position : SV_POSITION; + float4 color : COLOR; +}; + +float4 main(const ps_in v) : SV_TARGET +{ + return v.color; +} +#endif + 0x43425844, 0x1a6def50, 0x9c069300, 0x7cce68f0, 0x621239b9, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x0000003c, 0x00000050, + 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const struct + { + float color[4]; + } + colors[10] = + { + {{0.0f, 0.0f, 0.0f, 1.0f}}, + {{0.0f, 0.0f, 1.0f, 0.0f}}, + {{0.0f, 0.0f, 1.0f, 1.0f}}, + {{0.0f, 1.0f, 0.0f, 0.0f}}, + {{0.0f, 1.0f, 0.0f, 1.0f}}, + {{0.0f, 1.0f, 1.0f, 0.0f}}, + {{0.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 0.0f, 0.0f, 1.0f}}, + {{1.0f, 0.0f, 1.0f, 0.0f}}, + }; + static const struct + { + unsigned int index; + DWORD expected; + } + test_data[] = + { + {0, 0xff000000}, + {1, 0x00ff0000}, + {2, 0xffff0000}, + {3, 0x0000ff00}, + {4, 0xff00ff00}, + {5, 0x00ffff00}, + {6, 0xffffff00}, + {7, 0x000000ff}, + + {8, 0xff0000ff}, + {9, 0x00ff00ff}, + }; + static const float white_color[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &test_context.vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(colors); + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + resource_data.pSysMem = &colors; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &colors_cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(index); + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &index_cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &test_context.vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_VSSetConstantBuffers(context, 0, 1, &index_cb); + ID3D11DeviceContext_VSSetConstantBuffers(context, 1, 1, &colors_cb); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + { + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white_color); + + index[0] = test_data[i].index; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)index_cb, 0, NULL, &index, 0, 0); + + draw_quad(&test_context); + + color = get_texture_color(test_context.backbuffer, 319, 239); + ok(compare_color(color, test_data[i].expected, 1), + "Got unexpected color 0x%08x for index %u.\n", color, test_data[i].index); + } + + ID3D11Buffer_Release(index_cb); + ID3D11Buffer_Release(colors_cb); + ID3D11PixelShader_Release(ps); + + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -5242,4 +5440,5 @@ START_TEST(d3d11) test_multisample_init(); test_check_multisample_quality_levels(); test_clear_depth_stencil_view(); + test_cb_relative_addressing(); }

1 0