wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

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

28 Oct '15

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

Nikolay Sivov : msxml3/tests: Add missing return value test (PVS-Studio).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 121b859fc5ef4dc479bfd4cb496d97233975ee81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121b859fc5ef4dc479bfd4cb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 22:57:53 2015 +0300 msxml3/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/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1afc894..b563a80 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8977,6 +8977,7 @@ static void test_get_doctype(void) ok(doctype == NULL, "got %p\n", doctype); hr = IXMLDOMDocument_loadXML(doc, _bstr_(szEmailXML), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "failed to load XML string\n"); doctype = NULL;

1 0

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

28 Oct '15

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

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

28 Oct '15

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 : dwrite/tests: Add missing return value test (PVS-Studio).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: ad88407c9344df1b47993db0c8956df12bb6dda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad88407c9344df1b47993db0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 22:42:11 2015 +0300 dwrite/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/dwrite/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8ec4f84..e03c819 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4985,6 +4985,7 @@ static void test_GetPaletteEntries(void) IDWriteFont_Release(font); hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); + ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFace_Release(fontface); palettecount = IDWriteFontFace2_GetColorPaletteCount(fontface2);

1 0

Nikolay Sivov : dwrite: Use dpiX/ dpiY argument in GetRecommendedRenderingMode().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: ce6f6f7421ad0152355ef243a891ba3612781ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6f6f7421ad0152355ef243a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 22:42:10 2015 +0300 dwrite: Use dpiX/dpiY argument in GetRecommendedRenderingMode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 ++ dlls/dwrite/tests/font.c | 80 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b71d492..22de471 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1068,6 +1068,8 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac if (is_sideways) FIXME("sideways mode not supported\n"); + emSize *= max(dpiX, dpiY) / 96.0f; + *renderingmode = DWRITE_RENDERING_MODE_DEFAULT; *gridfitmode = DWRITE_GRID_FIT_MODE_DEFAULT; if (params) { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ae45e8b..8ec4f84 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4439,12 +4439,11 @@ if (0) /* crashes on native */ for (emsize = 1.0; emsize < 500.0; emsize += 1.0) { DWRITE_RENDERING_MODE expected; + FLOAT ppdip; WORD gasp; int i; for (i = 0; i < sizeof(recmode_tests)/sizeof(recmode_tests[0]); i++) { - FLOAT ppdip; - ppdip = 1.0f; mode = 10; gasp = get_gasp_flags(fontface, emsize, ppdip); @@ -4487,12 +4486,82 @@ if (0) /* crashes on native */ /* IDWriteFontFace1 offers another variant of this method */ if (fontface1) { for (i = 0; i < sizeof(recmode_tests1)/sizeof(recmode_tests1[0]); i++) { + FLOAT dpi; + + ppdip = 1.0f; + dpi = 96.0f * ppdip; mode = 10; - expected = get_expected_rendering_mode(emsize, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); - hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, 96.0, 96.0, + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, flags 0x%04x, expected %d\n", emsize, i, mode, gasp, expected); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + /* Only test larger sizes to workaround Win7 differences, where unscaled natural emsize threshold is used; + Win8 and Win10 handle this as expected. */ + if (emsize > 20.0f) { + ppdip = 2.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + ppdip = 0.5f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + /* try different dpis for X and Y direction */ + ppdip = 1.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi * 0.5f, dpi, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + ppdip = 1.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi * 0.5f, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + ppdip = 2.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi * 0.5f, dpi, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + + ppdip = 2.0f; + dpi = 96.0f * ppdip; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi * 0.5f, + NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + } } } @@ -4500,6 +4569,7 @@ if (0) /* crashes on native */ if (fontface2) { DWRITE_GRID_FIT_MODE gridfit, expected_gridfit; + gasp = get_gasp_flags(fontface, emsize, 1.0f); for (i = 0; i < sizeof(recmode_tests1)/sizeof(recmode_tests1[0]); i++) { mode = 10; expected = get_expected_rendering_mode(emsize, gasp, recmode_tests1[0].measuring, recmode_tests1[0].threshold);

1 0

Andrew Eikum : xaudio2: Add stub interface for FXEQ.
by Alexandre Julliard 28 Oct '15

28 Oct '15

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

Andrew Eikum : xaudio2_7: Move APO implementations to a new file.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 9da38fdbee1e78db7c5342ad6d16b2d173693afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da38fdbee1e78db7c5342ad6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 27 14:33:56 2015 -0500 xaudio2_7: Move APO implementations to a new file. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/Makefile.in | 1 + dlls/xaudio2_7/xapofx.c | 560 ++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 510 +----------------------------------- dlls/xaudio2_7/xaudio_private.h | 2 + 4 files changed, 564 insertions(+), 509 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9da38fdbee1e78db7c534…

1 0

Jacek Caban : rpcrt4: Added RpcMgmtIsServerListening tests.
by Alexandre Julliard 28 Oct '15

28 Oct '15

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: Added support for binding argument in RpcMgmtIsServerListening.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 41f93d8f59fd9aaddbbca88740226e17737e55d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f93d8f59fd9aaddbbca8874… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 27 19:28:28 2015 +0100 rpcrt4: Added support for binding argument in RpcMgmtIsServerListening. Based on patch by Andrew Eikum. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.h | 2 ++ dlls/rpcrt4/rpc_server.c | 12 +++++++--- dlls/rpcrt4/rpc_transport.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 7b8eaf3..1d73ebf 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -104,6 +104,7 @@ struct connection_ops { int (*write)(RpcConnection *conn, const void *buffer, unsigned int len); int (*close)(RpcConnection *conn); void (*cancel_call)(RpcConnection *conn); + RPC_STATUS (*is_server_listening)(const char *endpoint); int (*wait_for_incoming_data)(RpcConnection *conn); size_t (*get_top_of_tower)(unsigned char *tower_data, const char *networkaddr, const char *endpoint); RPC_STATUS (*parse_top_of_tower)(const unsigned char *tower_data, size_t tower_size, char **networkaddr, char **endpoint); @@ -162,6 +163,7 @@ RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; +RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 1e22d03..9c3dea7 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1676,9 +1676,15 @@ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) TRACE("(%p)\n", Binding); - EnterCriticalSection(&listen_cs); - if (manual_listen_count > 0) status = RPC_S_OK; - LeaveCriticalSection(&listen_cs); + if (Binding) { + RpcBinding *rpc_binding = (RpcBinding*)Binding; + status = RPCRT4_IsServerListening(rpc_binding->Protseq, rpc_binding->Endpoint); + }else { + EnterCriticalSection(&listen_cs); + if (manual_listen_count > 0) status = RPC_S_OK; + LeaveCriticalSection(&listen_cs); + } + return status; } diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 932fa64..54cef07 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -398,6 +398,33 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection return status; } +static RPC_STATUS is_pipe_listening(const char *pipe_name) +{ + return WaitNamedPipeA(pipe_name, 1) ? RPC_S_OK : RPC_S_NOT_LISTENING; +} + +static RPC_STATUS rpcrt4_ncacn_np_is_server_listening(const char *endpoint) +{ + char *pipe_name; + RPC_STATUS status; + + pipe_name = ncacn_pipe_name(endpoint); + status = is_pipe_listening(pipe_name); + I_RpcFree(pipe_name); + return status; +} + +static RPC_STATUS rpcrt4_ncalrpc_np_is_server_listening(const char *endpoint) +{ + char *pipe_name; + RPC_STATUS status; + + pipe_name = ncalrpc_pipe_name(endpoint); + status = is_pipe_listening(pipe_name); + I_RpcFree(pipe_name); + return status; +} + static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { RPC_STATUS status; @@ -1532,6 +1559,12 @@ static void rpcrt4_conn_tcp_cancel_call(RpcConnection *Connection) rpcrt4_sock_wait_cancel(tcpc); } +static RPC_STATUS rpcrt4_conn_tcp_is_server_listening(const char *endpoint) +{ + FIXME("\n"); + return RPC_S_ACCESS_DENIED; +} + static int rpcrt4_conn_tcp_wait_for_incoming_data(RpcConnection *Connection) { RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; @@ -3301,6 +3334,12 @@ static void rpcrt4_ncacn_http_cancel_call(RpcConnection *Connection) SetEvent(httpc->cancel_event); } +static RPC_STATUS rpcrt4_ncacn_http_is_server_listening(const char *endpoint) +{ + FIXME("\n"); + return RPC_S_ACCESS_DENIED; +} + static int rpcrt4_ncacn_http_wait_for_incoming_data(RpcConnection *Connection) { RpcConnection_http *httpc = (RpcConnection_http *) Connection; @@ -3342,6 +3381,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_ncacn_np_is_server_listening, rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncacn_np_get_top_of_tower, rpcrt4_ncacn_np_parse_top_of_tower, @@ -3362,6 +3402,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_ncalrpc_np_is_server_listening, rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncalrpc_get_top_of_tower, rpcrt4_ncalrpc_parse_top_of_tower, @@ -3382,6 +3423,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_tcp_write, rpcrt4_conn_tcp_close, rpcrt4_conn_tcp_cancel_call, + rpcrt4_conn_tcp_is_server_listening, rpcrt4_conn_tcp_wait_for_incoming_data, rpcrt4_ncacn_ip_tcp_get_top_of_tower, rpcrt4_ncacn_ip_tcp_parse_top_of_tower, @@ -3402,6 +3444,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_http_write, rpcrt4_ncacn_http_close, rpcrt4_ncacn_http_cancel_call, + rpcrt4_ncacn_http_is_server_listening, rpcrt4_ncacn_http_wait_for_incoming_data, rpcrt4_ncacn_http_get_top_of_tower, rpcrt4_ncacn_http_parse_top_of_tower, @@ -3575,6 +3618,20 @@ RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) return RPC_S_OK; } +RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint) +{ + const struct connection_ops *ops; + + ops = rpcrt4_get_conn_protseq_ops(protseq); + if (!ops) + { + FIXME("not supported for protseq %s\n", protseq); + return RPC_S_INVALID_BINDING; + } + + return ops->is_server_listening(endpoint); +} + RPC_STATUS RpcTransport_GetTopOfTower(unsigned char *tower_data, size_t *tower_size, const char *protseq,

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015