October 2015 - Wine-Commits

Nikolay Sivov : crypt32/tests: Fix printf format (PVS-Studio).
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 1b8f84cc3b1f752ee4574f75fc85d7c371bc8841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8f84cc3b1f752ee4574f75f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 00:27:26 2015 +0300 crypt32/tests: Fix printf format (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index b45b5f2..eae1282 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7262,7 +7262,7 @@ static void test_decodeNameConstraints(DWORD dwEncoding) if (constraints->cPermittedSubtree != encodedNameConstraints[i].constraints.cPermittedSubtree) - fprintf(stderr, "%d: expected %d permitted, got %d\n", i, + fprintf(stderr, "%d: expected %u permitted, got %u\n", i, encodedNameConstraints[i].constraints.cPermittedSubtree, constraints->cPermittedSubtree); if (constraints->cPermittedSubtree == @@ -7276,7 +7276,7 @@ static void test_decodeNameConstraints(DWORD dwEncoding) } if (constraints->cExcludedSubtree != encodedNameConstraints[i].constraints.cExcludedSubtree) - fprintf(stderr, "%d: expected %d excluded, got %d\n", i, + fprintf(stderr, "%d: expected %u excluded, got %u\n", i, encodedNameConstraints[i].constraints.cExcludedSubtree, constraints->cExcludedSubtree); if (constraints->cExcludedSubtree ==

1 0

Jacek Caban : mshtml/tests: Fixed more test failures on win10.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 79c59085b1b1f487e91c2695028dd3d1d257a468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c59085b1b1f487e91c26950… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 14:49:18 2015 +0100 mshtml/tests: Fixed more test failures on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0e7781b..89834ac 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -872,7 +872,12 @@ static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(riid, &IID_INewWindowManager)) { + *ppv = iface; + return S_OK; + } + + trace("NewWindowManager_QueryInterface %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -2873,8 +2878,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { - if(nCmdID != 63 && nCmdID != 178 && (!is_refresh || nCmdID != 37)) - test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2888,6 +2891,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID test_readyState(NULL); load_state = LD_LOADING; }else { + if(!is_refresh) + test_readyState(NULL); if(nav_url) test_GetCurMoniker(doc_unk, NULL, nav_serv_url, FALSE); else if(load_from_stream) @@ -2951,6 +2956,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(pvaIn) ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut)=%d\n", V_VT(pvaOut)); + test_readyState(NULL); return E_NOTIMPL; case 103: @@ -2959,6 +2965,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 105: @@ -2967,12 +2974,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 138: CHECK_EXPECT2(Exec_ShellDocView_138); ok(!pvaIn, "pvaIn != NULL\n"); ok(!pvaOut, "pvaOut != NULL\n"); + test_readyState(NULL); return S_OK; case 140: @@ -2981,6 +2990,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 83:

1 0

Vincent Povirk : maintainers: Add myself.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: e914629415d96f0f36b0d8e90ac965803af509f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e914629415d96f0f36b0d8e90… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 27 16:04:05 2015 -0500 maintainers: Add myself. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b425b52..a5d3a39 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -51,6 +51,11 @@ Common Controls Library P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ +Common Item Dialog +P: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/comdlg32/itemdlg.c +F: dlls/comdlg32/tests/itemdlg.c + Direct2D M: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ @@ -87,6 +92,14 @@ DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ +DotNet Runtime +M: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/mscoree/ + +GDIPlus +M: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/gdiplus/ + HID support M: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/ @@ -127,6 +140,15 @@ Netstat M: André Hentschel <nerv(a)dawncrow.de> F: programs/netstat/ +OLE Storage +M: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/ole32/filelockbytes.c +F: dlls/ole32/memlockbytes.c +F: dlls/ole32/stg_stream.c +F: dlls/ole32/storage32.c +F: dlls/ole32/storage32.h +F: dlls/ole32/tests/storage32.c + OLE Typelibs P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/oleaut32/typelib.c @@ -143,6 +165,11 @@ Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/ +Windows Imaging Component +M: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/windowscodecs/ +F: dlls/windowscodecsext/ + Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> @@ -160,6 +187,11 @@ VB Script M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/vbscript/ +X11 Driver +M: Alexandre Julliard <julliard(a)winehq.org> +P: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/winex11.drv/ + XML parsing M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/msxml*/ @@ -168,5 +200,6 @@ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> P: Alex Henrie <alexhenrie24(a)gmail.com> +P: Vincent Povirk <vincent(a)codeweavers.com> F: * F: */

1 0

Nikolay Sivov : mshtml/tests: Add missing return value test (PVS-Studio).
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 33809d2bccca635b37fb67751e4b39cdc08fbed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33809d2bccca635b37fb67751… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 22:52:30 2015 +0300 mshtml/tests: Add missing return value test (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 61d5de9..896e6ad 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5627,6 +5627,7 @@ static void test_plugins_col(IHTMLDocument2 *doc) window = get_doc_window(doc); hres = IHTMLWindow2_get_navigator(window, &nav); + ok(hres == S_OK, "get_navigator failed: %08x\n", hres); IHTMLWindow2_Release(window); hres = IOmNavigator_get_plugins(nav, &col);

1 0

Nikolay Sivov : msi/tests: Add missing return value test (PVS-Studio).
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: fe8ecc23aad83e481258eed5d1e3d685d0d8ec68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8ecc23aad83e481258eed5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 22:55:37 2015 +0300 msi/tests: Add missing return value test (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 05e3b1e..662ed4b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5904,6 +5904,7 @@ static void test_publish_components(void) res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, REG_OPTION_NON_VOLATILE, MAXIMUM_ALLOWED | KEY_WOW64_64KEY, NULL, &key, NULL ); + ok(res == ERROR_SUCCESS, "RegCreateKeyEx failed %d\n", res); res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); RegCloseKey(key);

1 0

Daniel Lehman : msvcp110: Make argument const for _Xtime_diff functions.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 4d5f866d99752441648b551aa95aee70c9e8efc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5f866d99752441648b551aa… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 27 17:25:11 2015 -0700 msvcp110: Make argument const for _Xtime_diff functions. 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/msvcp90/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 145e4dc..6501ff9 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -398,7 +398,7 @@ int __cdecl xtime_get(xtime* t, int unknown) } /* _Xtime_diff_to_millis2 */ -MSVCRT_long __cdecl _Xtime_diff_to_millis2(xtime *t1, xtime *t2) +MSVCRT_long __cdecl _Xtime_diff_to_millis2(const xtime *t1, const xtime *t2) { __time64_t diff_sec; MSVCRT_long diff_nsec, ret; @@ -413,7 +413,7 @@ MSVCRT_long __cdecl _Xtime_diff_to_millis2(xtime *t1, xtime *t2) } /* _Xtime_diff_to_millis */ -MSVCRT_long __cdecl _Xtime_diff_to_millis(xtime *t) +MSVCRT_long __cdecl _Xtime_diff_to_millis(const xtime *t) { xtime now;

1 0

Andrew Eikum : xaudio2: Add stub interface for FXEQ.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: daed36fbe3bcad9a287c295a583c46da77a03eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=daed36fbe3bcad9a287c295a5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 27 14:34:00 2015 -0500 xaudio2: Add stub interface for FXEQ. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xapofx1_1/main.c | 3 + dlls/xapofx1_2/main.c | 3 + dlls/xapofx1_3/main.c | 3 + dlls/xapofx1_4/main.c | 3 + dlls/xapofx1_5/main.c | 3 + dlls/xaudio2_7/tests/xaudio2.c | 9 +- dlls/xaudio2_7/xapofx.c | 219 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 42 ++++++++ dlls/xaudio2_7/xaudio_dll.c | 16 +++ dlls/xaudio2_8/xaudio_dll.c | 3 + 10 files changed, 299 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daed36fbe3bcad9a287c2…

1 0

Jacek Caban : rpcrt4: Added RpcMgmtIsServerListening tests.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: f3f07bdf35fcca0783ce492f9dc6695a2f5f3d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f07bdf35fcca0783ce492f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 27 19:28:48 2015 +0100 rpcrt4: Added RpcMgmtIsServerListening tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index bd9f001..0b31d3d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1532,6 +1532,26 @@ set_auth_info(RPC_BINDING_HANDLE handle) ok(status == RPC_S_OK, "RpcBindingSetAuthInfoExA failed %d\n", status); } +#define test_is_server_listening(a,b) _test_is_server_listening(__LINE__,a,b) +static void _test_is_server_listening(unsigned line, RPC_BINDING_HANDLE binding, RPC_STATUS expected_status) +{ + RPC_STATUS status; + status = RpcMgmtIsServerListening(binding); + ok_(__FILE__,line)(status == expected_status, "RpcMgmtIsServerListening returned %u, expected %u\n", + status, expected_status); +} + +#define test_is_server_listening2(a,b,c) _test_is_server_listening2(__LINE__,a,b,c) +static void _test_is_server_listening2(unsigned line, RPC_BINDING_HANDLE binding, RPC_STATUS expected_status, + RPC_STATUS expected_status2) +{ + RPC_STATUS status; + status = RpcMgmtIsServerListening(binding); + ok_(__FILE__,line)(status == expected_status || status == expected_status2, + "RpcMgmtIsServerListening returned %u, expected %u or %u\n", + status, expected_status, expected_status2); +} + static void client(const char *test) { @@ -1553,6 +1573,7 @@ client(const char *test) run_tests(); authinfo_test(RPC_PROTSEQ_TCP, 0); + test_is_server_listening2(IServer_IfHandle, RPC_S_OK, RPC_S_ACCESS_DENIED); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); @@ -1564,6 +1585,7 @@ client(const char *test) set_auth_info(IServer_IfHandle); authinfo_test(RPC_PROTSEQ_TCP, 1); + test_is_server_listening(IServer_IfHandle, RPC_S_ACCESS_DENIED); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); @@ -1575,6 +1597,7 @@ client(const char *test) run_tests(); /* can cause RPC_X_BAD_STUB_DATA exception */ authinfo_test(RPC_PROTSEQ_LRPC, 0); + test_is_server_listening(IServer_IfHandle, RPC_S_OK); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); @@ -1586,6 +1609,7 @@ client(const char *test) set_auth_info(IServer_IfHandle); authinfo_test(RPC_PROTSEQ_LRPC, 1); + test_is_server_listening(IServer_IfHandle, RPC_S_OK); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); @@ -1595,9 +1619,12 @@ client(const char *test) ok(RPC_S_OK == RpcStringBindingComposeA(NULL, np, address_np, pipe, NULL, &binding), "RpcStringBindingCompose\n"); ok(RPC_S_OK == RpcBindingFromStringBindingA(binding, &IServer_IfHandle), "RpcBindingFromStringBinding\n"); + test_is_server_listening(IServer_IfHandle, RPC_S_OK); run_tests(); authinfo_test(RPC_PROTSEQ_NMP, 0); + test_is_server_listening(IServer_IfHandle, RPC_S_OK); stop(); + test_is_server_listening(IServer_IfHandle, RPC_S_NOT_LISTENING); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); @@ -1638,8 +1665,10 @@ server(void) else status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); + test_is_server_listening(NULL, RPC_S_NOT_LISTENING); status = RpcServerListen(1, 20, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); + test_is_server_listening(NULL, RPC_S_OK); stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(stop_event != NULL, "CreateEvent failed with error %d\n", GetLastError());

1 0

Jacek Caban : rpcrt4: Moved formatting pipe names to helper functions.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 6c40b63d3e88f0117267ebb64db152fb6c8754f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c40b63d3e88f0117267ebb64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 27 19:27:48 2015 +0100 rpcrt4: Moved formatting pipe names to helper functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 53 +++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index fbc2ad7..932fa64 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -247,10 +247,21 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, return RPC_S_OK; } +static char *ncalrpc_pipe_name(const char *endpoint) +{ + static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; + char *pipe_name; + + /* protseq=ncalrpc: supposed to use NT LPC ports, + * but we'll implement it with named pipes for now */ + pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(endpoint)); + strcat(strcpy(pipe_name, prefix), endpoint); + return pipe_name; +} + static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; RPC_STATUS r; LPSTR pname; @@ -258,10 +269,7 @@ static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) if (npc->pipe) return RPC_S_OK; - /* protseq=ncalrpc: supposed to use NT LPC ports, - * but we'll implement it with named pipes for now */ - pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); + pname = ncalrpc_pipe_name(Connection->Endpoint); r = rpcrt4_conn_open_pipe(Connection, pname, TRUE); I_RpcFree(pname); @@ -270,7 +278,6 @@ static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, const char *endpoint) { - static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; RPC_STATUS r; LPSTR pname; RpcConnection *Connection; @@ -291,10 +298,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq if (r != RPC_S_OK) return r; - /* protseq=ncalrpc: supposed to use NT LPC ports, - * but we'll implement it with named pipes for now */ - pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); + pname = ncalrpc_pipe_name(Connection->Endpoint); r = rpcrt4_conn_create_pipe(Connection, pname); I_RpcFree(pname); @@ -306,10 +310,20 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq return r; } +static char *ncacn_pipe_name(const char *endpoint) +{ + static const char prefix[] = "\\\\."; + char *pipe_name; + + /* protseq=ncacn_np: named pipes */ + pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(endpoint)); + strcat(strcpy(pipe_name, prefix), endpoint); + return pipe_name; +} + static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - static const char prefix[] = "\\\\."; RPC_STATUS r; LPSTR pname; @@ -317,9 +331,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) if (npc->pipe) return RPC_S_OK; - /* protseq=ncacn_np: named pipes */ - pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); + pname = ncacn_pipe_name(Connection->Endpoint); r = rpcrt4_conn_open_pipe(Connection, pname, FALSE); I_RpcFree(pname); @@ -328,7 +340,6 @@ static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { - static const char prefix[] = "\\\\."; RPC_STATUS r; LPSTR pname; RpcConnection *Connection; @@ -349,9 +360,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse if (r != RPC_S_OK) return r; - /* protseq=ncacn_np: named pipes */ - pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); + pname = ncacn_pipe_name(Connection->Endpoint); r = rpcrt4_conn_create_pipe(Connection, pname); I_RpcFree(pname); @@ -379,12 +388,10 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection { RPC_STATUS status; LPSTR pname; - static const char prefix[] = "\\\\."; rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); - pname = I_RpcAllocate(strlen(prefix) + strlen(old_conn->Endpoint) + 1); - strcat(strcpy(pname, prefix), old_conn->Endpoint); + pname = ncacn_pipe_name(old_conn->Endpoint); status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); @@ -395,14 +402,12 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection { RPC_STATUS status; LPSTR pname; - static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; TRACE("%s\n", old_conn->Endpoint); rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); - pname = I_RpcAllocate(strlen(prefix) + strlen(old_conn->Endpoint) + 1); - strcat(strcpy(pname, prefix), old_conn->Endpoint); + pname = ncalrpc_pipe_name(old_conn->Endpoint); status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname);

1 0

Sebastian Lackner : gdiplus: Use the correct memory allocation function for PropVariants.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 2fdccc247e7ad136f30f8cabcb0fc1143ab37bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdccc247e7ad136f30f8cabc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 00:52:51 2015 +0200 gdiplus: Use the correct memory allocation function for PropVariants. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6725de8..1cef100 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3065,7 +3065,7 @@ static BOOL get_bool_property(IWICMetadataReader *reader, const GUID *guid, cons PropVariantInit(&value); id.vt = VT_LPWSTR; - id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + id.u.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); if (!id.u.pwszVal) return FALSE; lstrcpyW(id.u.pwszVal, prop_name); hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); @@ -3092,7 +3092,7 @@ static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, PropVariantInit(&value); id.vt = VT_LPWSTR; - id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + id.u.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); if (!id.u.pwszVal) return NULL; lstrcpyW(id.u.pwszVal, prop_name); hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value);

1 0