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

Nikolay Sivov : winhttp/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 1895345df813dfb728b40a0f0f6f7f9ba89c6e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1895345df813dfb728b40a0f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 13:19:04 2016 +0300 winhttp/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6be7598..1cc9ba0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3822,8 +3822,8 @@ static void test_IWinHttpRequest_Invoke(void) ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); VariantInit(&ret); -if (0) /* crashes */ - hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, &ret, NULL, &err); + if (0) /* crashes */ + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, &ret, NULL, &err); params.cArgs = 1; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err);

1 0

Nikolay Sivov : rpcrt4/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 6ac3c09a7640529e425cd51c9b24caa859c88b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac3c09a7640529e425cd51c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 13:19:03 2016 +0300 rpcrt4/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index aeecf8c..21baba7 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2433,9 +2433,9 @@ static void test_MesEncodeFixedBufferHandleCreate(void) status = MesEncodeFixedBufferHandleCreate(buffer, 0, &encoded_size, &handle); todo_wine ok(status == RPC_S_INVALID_ARG, "got %d\n", status); -if (status == RPC_S_OK) +if (status == RPC_S_OK) { MesHandleFree(handle); - +} status = MesEncodeFixedBufferHandleCreate(buffer, 32, NULL, &handle); ok(status == RPC_S_INVALID_ARG, "got %d\n", status);

1 0

Nikolay Sivov : ole32/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 4d0a353bccc9a750502a6de8312e94589d9d0432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0a353bccc9a750502a6de83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 13:19:02 2016 +0300 ole32/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3b523d1..b8bdaff 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2879,8 +2879,8 @@ static void test_CoGetMalloc(void) IMalloc *imalloc; HRESULT hr; -if (0) /* crashes on native */ - hr = CoGetMalloc(0, NULL); + if (0) /* crashes on native */ + hr = CoGetMalloc(0, NULL); imalloc = (void*)0xdeadbeef; hr = CoGetMalloc(0, &imalloc);

1 0

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

Aug. 10, 2016

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

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

Aug. 10, 2016

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

Iván Matellanes : msvcirt: Implement iostream assignment operators.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 346a64c08940f949843f844205ca6231c2ea4150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346a64c08940f949843f84420… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Aug 9 19:16:04 2016 +0100 msvcirt: Implement iostream assignment operators. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 7 ++--- dlls/msvcirt/tests/msvcirt.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 305eb9d..6533af0 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3997,7 +3997,9 @@ void __thiscall iostream_dtor(ios *base) DEFINE_THISCALL_WRAPPER(iostream_assign_sb, 8) iostream* __thiscall iostream_assign_sb(iostream *this, streambuf *sb) { - FIXME("(%p %p) stub\n", this, sb); + TRACE("(%p %p)\n", this, sb); + this->base1.count = 0; + ostream_assign_sb(&this->base2, sb); return this; } @@ -4006,8 +4008,7 @@ iostream* __thiscall iostream_assign_sb(iostream *this, streambuf *sb) DEFINE_THISCALL_WRAPPER(iostream_assign, 8) iostream* __thiscall iostream_assign(iostream *this, const iostream *rhs) { - FIXME("(%p %p) stub\n", this, rhs); - return this; + return iostream_assign_sb(this, istream_get_ios(&rhs->base1)->sb); } /* ??_Diostream@@QAEXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index c26e906..1b15949 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -380,6 +380,8 @@ static iostream* (*__thiscall p_iostream_sb_ctor)(iostream*, streambuf*, BOOL); static iostream* (*__thiscall p_iostream_ctor)(iostream*, BOOL); static void (*__thiscall p_iostream_dtor)(ios*); static void (*__thiscall p_iostream_vbase_dtor)(iostream*); +static iostream* (*__thiscall p_iostream_assign_sb)(iostream*, streambuf*); +static iostream* (*__thiscall p_iostream_assign)(iostream*, const iostream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -631,6 +633,8 @@ static BOOL init(void) SET(p_iostream_ctor, "??0iostream@@IEAA(a)XZ"); SET(p_iostream_dtor, "??1iostream@@UEAA(a)XZ"); SET(p_iostream_vbase_dtor, "??_Diostream@@QEAAXXZ"); + SET(p_iostream_assign_sb, "??4iostream@@IEAAAEAV0(a)PEAVstreambuf@@@Z"); + SET(p_iostream_assign, "??4iostream@@IEAAAEAV0(a)AEAV0@@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -804,6 +808,8 @@ static BOOL init(void) SET(p_iostream_ctor, "??0iostream@@IAE(a)XZ"); SET(p_iostream_dtor, "??1iostream@@UAE(a)XZ"); SET(p_iostream_vbase_dtor, "??_Diostream@@QAEXXZ"); + SET(p_iostream_assign_sb, "??4iostream@@IAEAAV0(a)PAVstreambuf@@@Z"); + SET(p_iostream_assign, "??4iostream@@IAEAAV0(a)AAV0@@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -5968,6 +5974,62 @@ static void test_iostream(void) ok(ios2.base_ios.width == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.width); ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); call_func1(p_iostream_dtor, &ios2.base_ios); + + /* assignment */ + ios2.base1.extract_delim = ios2.base1.count = 0xcdcdcdcd; + ios2.base2.unknown = 0xcdcdcdcd; + ios2.base_ios.sb = (streambuf*) 0xcdcdcdcd; + ios2.base_ios.state = 0xcdcdcdcd; + pios = call_func2(p_iostream_assign_sb, &ios2, &sb); + ok(pios == &ios2, "wrong return, expected %p got %p\n", &ios2, pios); + ok(ios2.base1.extract_delim == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base1.extract_delim); + ok(ios2.base1.count == 0, "expected 0 got %d\n", ios2.base1.count); + ok(ios2.base2.unknown == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base2.unknown); + ok(ios2.base_ios.sb == &sb, "expected %p got %p\n", &sb, ios2.base_ios.sb); + ok(ios2.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ios2.base_ios.state); + ok(ios2.base_ios.delbuf == 0, "expected 0 got %d\n", ios2.base_ios.delbuf); + ok(ios2.base_ios.tie == NULL, "expected %p got %p\n", NULL, ios2.base_ios.tie); + ok(ios2.base_ios.flags == 0, "expected 0 got %x\n", ios2.base_ios.flags); + ok(ios2.base_ios.precision == 6, "expected 6 got %d\n", ios2.base_ios.precision); + ok(ios2.base_ios.fill == ' ', "expected 32 got %d\n", ios2.base_ios.fill); + ok(ios2.base_ios.width == 0, "expected 0 got %d\n", ios2.base_ios.width); + ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); + ios2.base1.count = 0xcdcdcdcd; + memset(&ios2.base_ios, 0xcd, sizeof(ios)); + ios2.base_ios.delbuf = 0; + pios = call_func2(p_iostream_assign_sb, &ios2, NULL); + ok(pios == &ios2, "wrong return, expected %p got %p\n", &ios2, pios); + ok(ios2.base1.extract_delim == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base1.extract_delim); + ok(ios2.base1.count == 0, "expected 0 got %d\n", ios2.base1.count); + ok(ios2.base2.unknown == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base2.unknown); + ok(ios2.base_ios.sb == NULL, "expected %p got %p\n", NULL, ios2.base_ios.sb); + ok(ios2.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, ios2.base_ios.state); + ok(ios2.base_ios.delbuf == 0, "expected 0 got %d\n", ios2.base_ios.delbuf); + ok(ios2.base_ios.tie == NULL, "expected %p got %p\n", NULL, ios2.base_ios.tie); + ok(ios2.base_ios.flags == 0, "expected 0 got %x\n", ios2.base_ios.flags); + ok(ios2.base_ios.precision == 6, "expected 6 got %d\n", ios2.base_ios.precision); + ok(ios2.base_ios.fill == ' ', "expected 32 got %d\n", ios2.base_ios.fill); + ok(ios2.base_ios.width == 0, "expected 0 got %d\n", ios2.base_ios.width); + ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); + ios2.base1.count = 0xcdcdcdcd; + memset(&ios2.base_ios, 0xcd, sizeof(ios)); + ios2.base_ios.delbuf = 0; +if (0) /* crashes on native */ + pios = call_func2(p_iostream_assign, &ios2, NULL); + pios = call_func2(p_iostream_assign, &ios2, &ios1); + ok(pios == &ios2, "wrong return, expected %p got %p\n", &ios2, pios); + ok(ios2.base1.extract_delim == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base1.extract_delim); + ok(ios2.base1.count == 0, "expected 0 got %d\n", ios2.base1.count); + ok(ios2.base2.unknown == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base2.unknown); + ok(ios2.base_ios.sb == &sb, "expected %p got %p\n", &sb, ios2.base_ios.sb); + ok(ios2.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, ios2.base_ios.state); + ok(ios2.base_ios.delbuf == 0, "expected 0 got %d\n", ios2.base_ios.delbuf); + ok(ios2.base_ios.tie == NULL, "expected %p got %p\n", NULL, ios2.base_ios.tie); + ok(ios2.base_ios.flags == 0, "expected 0 got %x\n", ios2.base_ios.flags); + ok(ios2.base_ios.precision == 6, "expected 6 got %d\n", ios2.base_ios.precision); + ok(ios2.base_ios.fill == ' ', "expected 32 got %d\n", ios2.base_ios.fill); + ok(ios2.base_ios.width == 0, "expected 0 got %d\n", ios2.base_ios.width); + ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); } START_TEST(msvcirt)

1 0

Iván Matellanes : msvcirt: Implement iostream constructors/destructors.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 7de6bca9d22fd7cda4a3114cda4ccf565c4609d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de6bca9d22fd7cda4a3114cd… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Aug 9 19:16:03 2016 +0100 msvcirt: Implement iostream constructors/destructors. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 36 ++++++-- dlls/msvcirt/tests/msvcirt.c | 208 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7de6bca9d22fd7cda4a31…

1 0

Michael Stefaniuc : quartz: There is no point in tracing the GUID pointer too.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: fd992823192e8f85074c30f350517cc3239c15ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd992823192e8f85074c30f35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 13:03:39 2016 +0200 quartz: There is no point in tracing the GUID pointer too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 6 +++--- dlls/quartz/filtergraph.c | 50 +++++++++++++++++++++++++++------------------ dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- 4 files changed, 37 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd992823192e8f85074c3…

1 0

Iván Matellanes : msvcirt: Simplify some constructors and assignments.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 4b11bd80835ad7ca289b80d97499fbcf672e5fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b11bd80835ad7ca289b80d97… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Aug 9 19:16:05 2016 +0100 msvcirt: Simplify some constructors and assignments. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 102 ++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 65 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6533af0..fd721b5 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2296,28 +2296,37 @@ static inline ostream* ios_to_ostream(const ios *base) return (ostream*)((char*)base - ostream_vbtable[1]); } -/* ??0ostream@@QAE(a)PAVstreambuf@@@Z */ -/* ??0ostream@@QEAA(a)PEAVstreambuf@@@Z */ -DEFINE_THISCALL_WRAPPER(ostream_sb_ctor, 12) -ostream* __thiscall ostream_sb_ctor(ostream *this, streambuf *sb, BOOL virt_init) +/* ??0ostream@@IAE(a)XZ */ +/* ??0ostream@@IEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(ostream_ctor, 8) +ostream* __thiscall ostream_ctor(ostream *this, BOOL virt_init) { ios *base; - TRACE("(%p %p %d)\n", this, sb, virt_init); + TRACE("(%p %d)\n", this, virt_init); if (virt_init) { this->vbtable = ostream_vbtable; base = ostream_get_ios(this); - ios_sb_ctor(base, sb); - } else { + ios_ctor(base); + } else base = ostream_get_ios(this); - ios_init(base, sb); - } base->vtable = &MSVCP_ostream_vtable; this->unknown = 0; return this; } +/* ??0ostream@@QAE(a)PAVstreambuf@@@Z */ +/* ??0ostream@@QEAA(a)PEAVstreambuf@@@Z */ +DEFINE_THISCALL_WRAPPER(ostream_sb_ctor, 12) +ostream* __thiscall ostream_sb_ctor(ostream *this, streambuf *sb, BOOL virt_init) +{ + TRACE("(%p %p %d)\n", this, sb, virt_init); + ostream_ctor(this, virt_init); + ios_init(ostream_get_ios(this), sb); + return this; +} + /* ??0ostream@@IAE(a)ABV0@@Z */ /* ??0ostream@@IEAA(a)AEBV0@@Z */ DEFINE_THISCALL_WRAPPER(ostream_copy_ctor, 12) @@ -2326,26 +2335,6 @@ ostream* __thiscall ostream_copy_ctor(ostream *this, const ostream *copy, BOOL v return ostream_sb_ctor(this, ostream_get_ios(copy)->sb, virt_init); } -/* ??0ostream@@IAE(a)XZ */ -/* ??0ostream@@IEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(ostream_ctor, 8) -ostream* __thiscall ostream_ctor(ostream *this, BOOL virt_init) -{ - ios *base; - - TRACE("(%p %d)\n", this, virt_init); - - if (virt_init) { - this->vbtable = ostream_vbtable; - base = ostream_get_ios(this); - ios_ctor(base); - } else - base = ostream_get_ios(this); - base->vtable = &MSVCP_ostream_vtable; - this->unknown = 0; - return this; -} - /* ??1ostream@@UAE(a)XZ */ /* ??1ostream@@UEAA(a)XZ */ /* ??1ostream_withassign@@UAE(a)XZ */ @@ -2389,11 +2378,7 @@ ostream* __thiscall ostream_assign_sb(ostream *this, streambuf *sb) DEFINE_THISCALL_WRAPPER(ostream_assign, 8) ostream* __thiscall ostream_assign(ostream *this, const ostream *rhs) { - ios *base_rhs = ostream_get_ios(rhs); - - TRACE("(%p %p)\n", this, rhs); - - return ostream_assign_sb(this, base_rhs->sb); + return ostream_assign_sb(this, ostream_get_ios(rhs)->sb); } /* ??_Dostream@@QAEXXZ */ @@ -2956,23 +2941,21 @@ static inline istream* ios_to_istream(const ios *base) return (istream*)((char*)base - istream_vbtable[1]); } -/* ??0istream@@QAE(a)PAVstreambuf@@@Z */ -/* ??0istream@@QEAA(a)PEAVstreambuf@@@Z */ -DEFINE_THISCALL_WRAPPER(istream_sb_ctor, 12) -istream* __thiscall istream_sb_ctor(istream *this, streambuf *sb, BOOL virt_init) +/* ??0istream@@IAE(a)XZ */ +/* ??0istream@@IEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(istream_ctor, 8) +istream* __thiscall istream_ctor(istream *this, BOOL virt_init) { ios *base; - TRACE("(%p %p %d)\n", this, sb, virt_init); + TRACE("(%p %d)\n", this, virt_init); if (virt_init) { this->vbtable = istream_vbtable; base = istream_get_ios(this); - ios_sb_ctor(base, sb); - } else { + ios_ctor(base); + } else base = istream_get_ios(this); - ios_init(base, sb); - } base->vtable = &MSVCP_istream_vtable; base->flags |= FLAGS_skipws; this->extract_delim = 0; @@ -2980,6 +2963,17 @@ istream* __thiscall istream_sb_ctor(istream *this, streambuf *sb, BOOL virt_init return this; } +/* ??0istream@@QAE(a)PAVstreambuf@@@Z */ +/* ??0istream@@QEAA(a)PEAVstreambuf@@@Z */ +DEFINE_THISCALL_WRAPPER(istream_sb_ctor, 12) +istream* __thiscall istream_sb_ctor(istream *this, streambuf *sb, BOOL virt_init) +{ + TRACE("(%p %p %d)\n", this, sb, virt_init); + istream_ctor(this, virt_init); + ios_init(istream_get_ios(this), sb); + return this; +} + /* ??0istream@@IAE(a)ABV0@@Z */ /* ??0istream@@IEAA(a)AEBV0@@Z */ DEFINE_THISCALL_WRAPPER(istream_copy_ctor, 12) @@ -2988,28 +2982,6 @@ istream* __thiscall istream_copy_ctor(istream *this, const istream *copy, BOOL v return istream_sb_ctor(this, istream_get_ios(copy)->sb, virt_init); } -/* ??0istream@@IAE(a)XZ */ -/* ??0istream@@IEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(istream_ctor, 8) -istream* __thiscall istream_ctor(istream *this, BOOL virt_init) -{ - ios *base; - - TRACE("(%p %d)\n", this, virt_init); - - if (virt_init) { - this->vbtable = istream_vbtable; - base = istream_get_ios(this); - ios_ctor(base); - } else - base = istream_get_ios(this); - base->vtable = &MSVCP_istream_vtable; - base->flags |= FLAGS_skipws; - this->extract_delim = 0; - this->count = 0; - return this; -} - /* ??1istream@@UAE(a)XZ */ /* ??1istream@@UEAA(a)XZ */ /* ??1istream_withassign@@UAE(a)XZ */

1 0

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

Aug. 10, 2016

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