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

Alistair Leslie-Hughes : d3dx11: Add D3DX11CompileFromFileA/W stub.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 2bee102353aab551a5e274624acb32358f0b72c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bee102353aab551a5e274624… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 10 04:40:39 2016 +0000 d3dx11: Add D3DX11CompileFromFileA/W stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/async.c | 24 ++++++++++++++++++++++++ dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- include/d3dx11async.h | 8 ++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 632e201..cb02a95 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,6 +1,6 @@ @ stdcall D3DX11CheckVersion(long long) -@ stub D3DX11CompileFromFileA -@ stub D3DX11CompileFromFileW +@ stdcall D3DX11CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX11CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) @ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index 2c17ffb..b33c235 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -41,3 +41,27 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const return D3DCompile(data, data_size, filename, defines, include, entry_point, target, sflags, eflags, shader, error_messages); } + +HRESULT WINAPI D3DX11CompileFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, + ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) +{ + FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " + "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", + debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), + sflags, eflags, pump, shader, error_messages, hresult); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, + ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) +{ + FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " + "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", + debugstr_w(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), + sflags, eflags, pump, shader, error_messages, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index cb76d5f..69c12fb 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -1,6 +1,6 @@ @ stdcall D3DX11CheckVersion(long long) -@ stub D3DX11CompileFromFileA -@ stub D3DX11CompileFromFileW +@ stdcall D3DX11CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX11CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) @ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW diff --git a/include/d3dx11async.h b/include/d3dx11async.h index 210067b..ab4b507 100644 --- a/include/d3dx11async.h +++ b/include/d3dx11async.h @@ -30,6 +30,14 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult); +HRESULT WINAPI D3DX11CompileFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, + ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult); + +HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, + ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult); + #ifdef __cplusplus } #endif

1 0

Józef Kucia : ddraw/tests: Add tests for edge antialiasing blending.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: b808b0758db3b26506a80ac4bd8822cf3a7a6709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b808b0758db3b26506a80ac4b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 10 11:38:41 2016 +0200 ddraw/tests: Add tests for edge antialiasing blending. 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/ddraw/tests/ddraw2.c | 210 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 206 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 642 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b808b0758db3b26506a80…

1 0

Józef Kucia : wined3d: Do not enable blending for edge/line antialiasing.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: eaa20836d245782d60b944a765cdbd966eccd281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa20836d245782d60b944a76… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 10 11:38:42 2016 +0200 wined3d: Do not enable blending for edge/line antialiasing. 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/d3d10core/tests/device.c | 4 +-- dlls/d3d11/tests/d3d11.c | 4 +-- dlls/d3d8/tests/visual.c | 4 +-- dlls/d3d9/tests/visual.c | 4 +-- dlls/ddraw/tests/ddraw2.c | 4 +-- dlls/ddraw/tests/ddraw4.c | 4 +-- dlls/ddraw/tests/ddraw7.c | 4 +-- dlls/wined3d/state.c | 67 +++++++++++++++++++++---------------------- 8 files changed, 46 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaa20836d245782d60b94…

1 0

Piotr Caban : msvcrt: Don't set frame to 0 in x86_64 _setjmp.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 882980c17a9a033fa8e49a4c116af9583698d218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882980c17a9a033fa8e49a4c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 10 15:17:16 2016 +0200 msvcrt: Don't set frame to 0 in x86_64 _setjmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d6d4b04..69daf2e 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -613,7 +613,6 @@ unsigned int CDECL __CxxQueryExceptionSize(void) * _setjmp (MSVCRT.@) */ __ASM_GLOBAL_FUNC( MSVCRT__setjmp, - "xorq %rdx,%rdx\n\t" /* frame */ "jmp " __ASM_NAME("MSVCRT__setjmpex") ); /*******************************************************************

1 0

Michael Stefaniuc : kernel32/tests: Remove another identical if/ else branch.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 3bc7549f4272d92c02377d0cbd725bdcaa6ddc36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc7549f4272d92c02377d0cb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:31:38 2016 +0200 kernel32/tests: Remove another identical if/else branch. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 583abf6..40de97a 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2782,10 +2782,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); - if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); - else - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); /* Now a bit more complicated, the page containing the code is protected with * PAGE_GUARD memory protection. */

1 0

Michael Stefaniuc : ole32/tests: Use todo_wine_if().
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: b6a505f9a57c5077bd1805746e9e5800b4c0bb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a505f9a57c5077bd1805746… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:34:25 2016 +0200 ole32/tests: Use todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/propvariant.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 0786a8e..ade45fb 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -166,16 +166,7 @@ static void expect(HRESULT hr, VARTYPE vt, BOOL copy, int line) } else if(flags == PROP_V0) ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); - else if(flags & PROP_TODO) - { - todo_wine - { - if(hr != S_OK) - win_skip("%s (%s): unsupported\n", wine_vtypes[idx], modifier); - else ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); - } - } - else + else todo_wine_if(flags & PROP_TODO) { if(hr != S_OK) win_skip("%s (%s): unsupported\n", wine_vtypes[idx], modifier);

1 0

Sebastian Lackner : services: Preparation to allow arbitrary data in service RPC messages.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 5f2b96b859d1087557949d855d6fd0e68b128a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2b96b859d1087557949d855… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 10 08:30:29 2016 +0200 services: Preparation to allow arbitrary data in service RPC messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/svcctl.idl | 2 +- programs/services/rpc.c | 4 ++-- programs/services/services.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index cadc5fd..98412d6 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -46,7 +46,7 @@ typedef struct service_start_info_t DWORD total_size; /* total request size */ DWORD name_size; /* size of name in data buffer */ DWORD control; /* control code */ - WCHAR data[1]; + BYTE data[1]; } service_start_info; [ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 3ebf378..54947c6 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1046,14 +1046,14 @@ static BOOL process_send_control(struct process_entry *process, const WCHAR *nam BOOL r; /* calculate how much space we need to send the startup info */ - len = strlenW(name) + 1; + len = (strlenW(name) + 1) * sizeof(WCHAR); 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(name) + 1; - strcpyW(ssi->data, name); + strcpyW((WCHAR *)ssi->data, name); r = process_send_command(process, ssi, ssi->total_size, result); HeapFree( GetProcessHeap(), 0, ssi ); diff --git a/programs/services/services.c b/programs/services/services.c index ae5da2b..8e49906 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -861,17 +861,17 @@ static BOOL process_send_start_message(struct process_entry *process, const WCHA len = strlenW(name) + 1; for (i=0; i<argc; i++) len += strlenW(argv[i])+1; - len++; + len = (len + 1) * sizeof(WCHAR); ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, data[len])); ssi->cmd = WINESERV_STARTINFO; ssi->control = 0; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); ssi->name_size = strlenW(name) + 1; - strcpyW(ssi->data, name); + strcpyW((WCHAR *)ssi->data, name); /* copy service args into a single buffer*/ - p = &ssi->data[ssi->name_size]; + p = (WCHAR *)&ssi->data[ssi->name_size * sizeof(WCHAR)]; for (i=0; i<argc; i++) { strcpyW(p, argv[i]);

1 0

Sebastian Lackner : advapi32: Validate received service name.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 7a200887bb9a455b83b462060b290e6a5a9db225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a200887bb9a455b83b462060… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 10 08:31:34 2016 +0200 advapi32: Validate received service name. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 0eb0a47..273e7c7 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -424,7 +424,8 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) { service_data *service; service_start_info info; - WCHAR *data = NULL; + BYTE *data = NULL; + WCHAR *name; BOOL r; DWORD data_size = 0, count, result; @@ -460,16 +461,24 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) } } - /* find the service */ + /* validate service name */ + name = (WCHAR *)data; + if (!info.name_size || data_size < info.name_size * sizeof(WCHAR) || name[info.name_size - 1]) + { + ERR( "got request without valid service name\n" ); + result = ERROR_INVALID_PARAMETER; + goto done; + } - if (!(service = find_service_by_name( data ))) + /* find the service */ + if (!(service = find_service_by_name( name ))) { - FIXME( "got request %u for unknown service %s\n", info.cmd, debugstr_w(data)); + FIXME( "got request %u for unknown service %s\n", info.cmd, debugstr_w(name)); result = ERROR_INVALID_PARAMETER; goto done; } - TRACE( "got request %u for service %s\n", info.cmd, debugstr_w(data) ); + TRACE( "got request %u for service %s\n", info.cmd, debugstr_w(name) ); /* handle the request */ switch (info.cmd) @@ -477,12 +486,12 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) case WINESERV_STARTINFO: if (!service->handle) { - if (!(service->handle = OpenServiceW( disp->manager, data, SERVICE_SET_STATUS )) || - !(service->full_access_handle = OpenServiceW( disp->manager, data, + if (!(service->handle = OpenServiceW( disp->manager, name, SERVICE_SET_STATUS )) || + !(service->full_access_handle = OpenServiceW( disp->manager, name, GENERIC_READ|GENERIC_WRITE ))) - FIXME( "failed to open service %s\n", debugstr_w(data) ); + FIXME( "failed to open service %s\n", debugstr_w(name) ); } - result = service_handle_start(service, data, data_size / sizeof(WCHAR)); + result = service_handle_start(service, (WCHAR *)data, data_size / sizeof(WCHAR)); break; case WINESERV_SENDCONTROL: result = service_handle_control(service, info.control);

1 0

Sebastian Lackner : services: Implement functionality to transfer extra data when sending service control.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 8f8626feef10ea1277d4201662e1212444b6a8f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8626feef10ea1277d420166… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 10 08:32:11 2016 +0200 services: Implement functionality to transfer extra data when sending service control. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 13 +++++++------ programs/services/rpc.c | 10 ++++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 273e7c7..86bd713 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -401,14 +401,14 @@ static DWORD service_handle_start(service_data *service, const WCHAR *data, DWOR /****************************************************************************** * service_handle_control */ -static DWORD service_handle_control(const service_data *service, DWORD dwControl) +static DWORD service_handle_control(const service_data *service, DWORD control, void *data) { DWORD ret = ERROR_INVALID_SERVICE_CONTROL; - TRACE("%s control %u\n", debugstr_w(service->name), dwControl); + TRACE("%s control %u data %p\n", debugstr_w(service->name), control, data); if (service->handler) - ret = service->handler(dwControl, 0, NULL, service->context); + ret = service->handler(control, 0, data, service->context); return ret; } @@ -494,7 +494,8 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) result = service_handle_start(service, (WCHAR *)data, data_size / sizeof(WCHAR)); break; case WINESERV_SENDCONTROL: - result = service_handle_control(service, info.control); + result = service_handle_control(service, info.control, (data_size > info.name_size * sizeof(WCHAR)) ? + &data[info.name_size * sizeof(WCHAR)] : NULL); break; default: ERR("received invalid command %u\n", info.cmd); @@ -589,13 +590,13 @@ static BOOL service_run_main_thread(void) { FIXME("service should be able to delay shutdown\n"); timeout += spi.dwPreshutdownTimeout; - ret = service_handle_control( services[i], SERVICE_CONTROL_PRESHUTDOWN ); + ret = service_handle_control( services[i], SERVICE_CONTROL_PRESHUTDOWN, NULL ); wait_handles[n++] = services[i]->thread; } } else if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN)) { - ret = service_handle_control( services[i], SERVICE_CONTROL_SHUTDOWN ); + ret = service_handle_control( services[i], SERVICE_CONTROL_SHUTDOWN, NULL ); wait_handles[n++] = services[i]->thread; } } diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 54947c6..17900cc 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1039,21 +1039,23 @@ BOOL process_send_command(struct process_entry *process, const void *data, DWORD /****************************************************************************** * process_send_control */ -static BOOL process_send_control(struct process_entry *process, const WCHAR *name, DWORD dwControl, DWORD *result) +static BOOL process_send_control(struct process_entry *process, const WCHAR *name, DWORD control, + const BYTE *data, DWORD data_size, DWORD *result) { service_start_info *ssi; DWORD len; BOOL r; /* calculate how much space we need to send the startup info */ - len = (strlenW(name) + 1) * sizeof(WCHAR); + len = (strlenW(name) + 1) * sizeof(WCHAR) + data_size; ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, data[len])); ssi->cmd = WINESERV_SENDCONTROL; - ssi->control = dwControl; + ssi->control = control; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); ssi->name_size = strlenW(name) + 1; strcpyW((WCHAR *)ssi->data, name); + if (data_size) memcpy(&ssi->data[ssi->name_size * sizeof(WCHAR)], data, data_size); r = process_send_command(process, ssi, ssi->total_size, result); HeapFree( GetProcessHeap(), 0, ssi ); @@ -1185,7 +1187,7 @@ DWORD __cdecl svcctl_ControlService( return ERROR_SERVICE_REQUEST_TIMEOUT; } - process_send_control(process, service->service_entry->name, dwControl, &result); + process_send_control(process, service->service_entry->name, dwControl, NULL, 0, &result); if (lpServiceStatus) {

1 0

Daniel Lehman : msvcp140: Add _Query_perf_[counter|frequency].
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 1026e85d9f041fbd34d431b718740d1deb76fc95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1026e85d9f041fbd34d431b71… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 10 10:09:25 2016 +0200 msvcp140: Add _Query_perf_[counter|frequency]. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/misc.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 22c302e..6e17e0d 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3690,8 +3690,8 @@ @ stub _Mtxunlock @ extern _Nan _Nan @ stub _Open_dir -@ stub _Query_perf_counter -@ stub _Query_perf_frequency +@ cdecl -ret64 _Query_perf_counter() +@ cdecl -ret64 _Query_perf_frequency() @ stub _Read_dir @ stub _Remove_dir @ stub _Rename diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 418f42b..7418fd2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1180,3 +1180,19 @@ void free_misc(void) NtClose(keyed_event); #endif } + +#if _MSVCP_VER >= 140 +LONGLONG __cdecl _Query_perf_counter(void) +{ + LARGE_INTEGER li; + QueryPerformanceCounter(&li); + return li.QuadPart; +} + +LONGLONG __cdecl _Query_perf_frequency(void) +{ + LARGE_INTEGER li; + QueryPerformanceFrequency(&li); + return li.QuadPart; +} +#endif

1 0