- Wine-Devel - list.winehq.org

[PATCH 4/4] shell32: Implement ShellLinkObject::get_Path.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49591 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/shell32/shelldispatch.c | 15 +++++++++++++-- dlls/shell32/tests/shelldispatch.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 3dcfe0ce626..df0e22191c4 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -738,9 +738,20 @@ static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID disp static HRESULT WINAPI ShellLinkObject_get_Path(IShellLinkDual2 *iface, BSTR *pbs) { - FIXME("(%p, %p)\n", iface, pbs); + ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); + WCHAR path[MAX_PATH]; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pbs); + + *pbs = NULL; + + hr = IShellLinkW_GetPath(This->shell_link, path, MAX_PATH, NULL, 0); + if (hr != S_OK) + return hr; + + *pbs = SysAllocString(path); + return hr; } static HRESULT WINAPI ShellLinkObject_put_Path(IShellLinkDual2 *iface, BSTR bs) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 622a3a95f9c..153584fe292 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1498,7 +1498,7 @@ static void test_ShellLinkObject(void) str = (BSTR)0xdeadbeef; hr = IShellLinkDual2_get_Path(sld, &str); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { GetFullPathNameW(L"winetest_empty_file.txt", MAX_PATH, tempW, NULL); ok(!wcscmp(str, tempW), "got %s\n", wine_dbgstr_w(str)); -- 2.28.0

2 1

[PATCH 3/4] shell32: Implement FolderItem::get_GetLink.
by Myah Caron Sept. 13, 2020

Sept. 13, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/shell32/shelldispatch.c | 17 +++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index f4947c815f1..3dcfe0ce626 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1109,10 +1109,23 @@ static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem2 *iface, BSTR *path) static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, IDispatch **ppid) { - FIXME("(%p,%p)\n", iface, ppid); + IShellLinkDual2 *link; + HRESULT hr; + FolderItemImpl *This = impl_from_FolderItem(iface); + + TRACE("(%p,%p)\n", iface, ppid); *ppid = NULL; - return E_NOTIMPL; + + if (!(This->attributes & SFGAO_LINK)) + return E_NOTIMPL; + + hr = ShellLinkObject_Constructor(This, &link); + if (hr != S_OK) + return hr; + + *ppid = (IDispatch*)link; + return S_OK; } static HRESULT WINAPI FolderItemImpl_get_GetFolder(FolderItem2 *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3c1c473dede..622a3a95f9c 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1490,8 +1490,8 @@ static void test_ShellLinkObject(void) dispatch = (IDispatch*)0xdeadbeef; hr = FolderItem_get_GetLink(item, &dispatch); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(dispatch && dispatch != (IDispatch*)0xdeadbeef, "got %p\n", dispatch); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dispatch && dispatch != (IDispatch*)0xdeadbeef, "got %p\n", dispatch); if (dispatch) { sld = (IShellLinkDual2*)dispatch; -- 2.28.0

2 1

help needed stdlib not linking
by spaarder Sept. 13, 2020

Sept. 13, 2020

Hello, I want to contribute to the wonderful Wine project, so I decided to start with a simple patch for the CreateSymbolicLinkW WINAP in kernelbase.dll . In my patch I use the system() function, which is in the stdlib library. The linker cannot find this library because of the "- nodefautlibs" in Makefile.in . When I remove -nodefaultlibs, all compiles well, but now wineboot (and probably a _lot_ of other things) are broken, even if I undo my patch. Why does removing -nodefaultlibs from wine/dlls/kernelbase/Makefile.in break so many things? Has it anything to do with @ cdecl system(str) MSVCRT_system? What would be the "proper" (wine) way to solve this? Big thanks! Hans.

2 3

[PATCH] ieframe: Implement IWebBrowser2::get_LocationName().
by Gijs Vermeulen Sept. 12, 2020

Sept. 12, 2020

From: Andrey Turkin <andrey.turkin(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 15 +++++++++++++++ dlls/ieframe/webbrowser.c | 21 +++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9c2c393aaf..2408594ef7 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -256,6 +256,19 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const WCHAR *exur } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IWebBrowser2 *wb, const WCHAR *exname) +{ + BSTR name = (void*)0xdeadbeef; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); +todo_wine_if(!is_http && *exname) + ok_(__FILE__,line) (!lstrcmpW(name, exname), "expected %s, got %s\n", wine_dbgstr_w(exname), wine_dbgstr_w(name)); + SysFreeString(name); +} + #define test_ready_state(a,b) _test_ready_state(__LINE__,a,b) static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL expect_busy) { @@ -2791,11 +2804,13 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static void test_Navigate2(IWebBrowser2 *webbrowser, const WCHAR *nav_url) { + const WCHAR *title = L"WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; VARIANT url; BOOL is_file; HRESULT hres; test_LocationURL(webbrowser, is_first_load ? L"" : current_url); + test_LocationName(webbrowser, is_first_load ? L"" : (is_http ? title : current_url)); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE, VARIANT_FALSE); is_http = !memcmp(nav_url, "http:", 5); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 87b74b8e01..965cd5f0ee 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -539,8 +539,25 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + IHTMLDocument2 *doc; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, LocationName); + + if(This->doc_host.document && + SUCCEEDED(IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc))) { + hres = IHTMLDocument2_get_title(doc, LocationName); + IHTMLDocument2_Release(doc); + } else if(This->doc_host.url) { + *LocationName = SysAllocString(This->doc_host.url); + hres = S_OK; + } else { + static const WCHAR null_char = 0; + *LocationName = SysAllocString(&null_char); + hres = S_FALSE; + } + + return hres; } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.28.0

2 1

[PATCH v3] user32/tests: Add more tests for GetMouseMovePointsEx.
by Myah Caron Sept. 12, 2020

Sept. 12, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=36873 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v3: Fix another instance where timestamps need to be accurate. Sorry for the noise. Original notes below: So far, this is the only salvagable part of a patchset I was working on to implement GetMouseMovePointsEx. Though I haven't tested this yet, according to what I understood from MSDN, the list of points is stored in user space, not kernel space: >The GetMouseMovePointsEx function will return points that eventually were dispatched not only to the calling >thread but also to other threads. My current belief (please correct me if you have any better ideas!) is that a separate internal wine message will be needed to implement it, as I was unable to abuse any of the existing ones to add this functionality (none contained all necessary fields). Regarding this patch, the tests check the following: - The last 64 points - The last 32 points after 32 points - Same, but with an explicit timestamp - Same, after a new point with the same coordinates have been added - Same, but using the timestamp for the new point dlls/user32/tests/input.c | 143 +++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1809c147cbd..c4b9e2b6f9c 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1477,10 +1477,12 @@ static void test_GetMouseMovePointsEx(void) { #define BUFLIM 64 #define MYERROR 0xdeadbeef - int count, retval; + int count, retval, last_error; + DWORD old_time, old_time1, new_time, new_time1; MOUSEMOVEPOINT in; MOUSEMOVEPOINT out[200]; POINT point; + int i, j, expected; /* Get a valid content for the input struct */ if(!GetCursorPos(&point)) { @@ -1605,6 +1607,145 @@ static void test_GetMouseMovePointsEx(void) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + old_time = GetTickCount(); + for (i = 0; i < 64; i++) { + SetCursorPos((i+1)*2, (i+1)); + } + old_time1 = GetTickCount(); + + count = 64; + in.x = (63+1)*2; + in.y = (63+1); + in.time = 0; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 64, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + in.x = (31+1)*2; + in.y = (31+1); + in.time = 0; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 32, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + if (old_time == old_time1) { + in.time = old_time; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 32, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + } else { + skip("Unable to accurately fetch old timestamp (%d, %d)\n", old_time, old_time1); + } + + Sleep(2); + + new_time = GetTickCount(); + SetCursorPos(in.x, in.y); + new_time1 = GetTickCount(); + + if (old_time == old_time1) { + in.time = old_time; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 31, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 2) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 2; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + } else { + skip("Unable to accurately fetch old timestamp (%d, %d)\n", old_time, old_time1); + } + + if (new_time == new_time1) { + in.time = new_time; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 64, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + if (j == 0) + expected = in.x; + else if (j == 63) + expected = 4; + else + expected = (i + 2) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + if (j == 0) + expected = in.y; + else if (j == 63) + expected = 2; + else + expected = i + 2; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + } else { + skip("Unable to accurately fetch new timestamp (%d, %d)\n", new_time, new_time1); + } + #undef BUFLIM #undef MYERROR } -- 2.28.0

2 2

[PATCH v2] user32/tests: Add more tests for GetMouseMovePointsEx.
by Myah Caron Sept. 12, 2020

Sept. 12, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=36873 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: Ensure the timestamps are likely to be accurate before testing. Original notes below: So far, this is the only salvagable part of a patchset I was working on to implement GetMouseMovePointsEx. Though I haven't tested this yet, according to what I understood from MSDN, the list of points is stored in user space, not kernel space: >The GetMouseMovePointsEx function will return points that eventually were dispatched not only to the calling >thread but also to other threads. My current belief (please correct me if you have any better ideas!) is that a separate internal wine message will be needed to implement it, as I was unable to abuse any of the existing ones to add this functionality (none contained all necessary fields). Regarding this patch, the tests check the following: - The last 64 points - The last 32 points after 32 points - Same, but with an explicit timestamp - Same, after a new point with the same coordinates have been added - Same, but using the timestamp for the new point dlls/user32/tests/input.c | 137 +++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1809c147cbd..a8097820181 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1477,10 +1477,12 @@ static void test_GetMouseMovePointsEx(void) { #define BUFLIM 64 #define MYERROR 0xdeadbeef - int count, retval; + int count, retval, last_error; + DWORD old_time, old_time1, new_time, new_time1; MOUSEMOVEPOINT in; MOUSEMOVEPOINT out[200]; POINT point; + int i, j, expected; /* Get a valid content for the input struct */ if(!GetCursorPos(&point)) { @@ -1605,6 +1607,139 @@ static void test_GetMouseMovePointsEx(void) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + old_time = GetTickCount(); + for (i = 0; i < 64; i++) { + SetCursorPos((i+1)*2, (i+1)); + } + old_time1 = GetTickCount(); + + count = 64; + in.x = (63+1)*2; + in.y = (63+1); + in.time = 0; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 64, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + in.x = (31+1)*2; + in.y = (31+1); + in.time = 0; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 32, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + if (old_time == old_time1) { + in.time = old_time; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 32, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + } else { + skip("Unable to accurately fetch old timestamp (%d, %d)\n", old_time, old_time1); + } + + Sleep(2); + + new_time = GetTickCount(); + SetCursorPos(in.x, in.y); + new_time1 = GetTickCount(); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 31, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 2) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 2; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + if (new_time == new_time1) { + in.time = new_time; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 64, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + if (j == 0) + expected = in.x; + else if (j == 63) + expected = 4; + else + expected = (i + 2) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + if (j == 0) + expected = in.y; + else if (j == 63) + expected = 2; + else + expected = i + 2; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + } else { + skip("Unable to accurately fetch new timestamp (%d, %d)\n", new_time, new_time1); + } + #undef BUFLIM #undef MYERROR } -- 2.28.0

2 1

[PATCH] user32/tests: Add more tests for GetMouseMovePointsEx.
by Myah Caron Sept. 12, 2020

Sept. 12, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=36873 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- So far, this is the only salvagable part of a patchset I was working on to implement GetMouseMovePointsEx. Though I haven't tested this yet, according to what I understood from MSDN, the list of points is stored in user space, not kernel space: >The GetMouseMovePointsEx function will return points that eventually were dispatched not only to the calling >thread but also to other threads. My current belief (please correct me if you have any better ideas!) is that a separate internal wine message will be needed to implement it, as I was unable to abuse any of the existing ones to add this functionality (none contained all necessary fields). Regarding this patch, the tests check the following: - The last 64 points - The last 32 points after 32 points - Same, but with an explicit timestamp - Same, after a new point with the same coordinates have been added - Same, but using the timestamp for the new point dlls/user32/tests/input.c | 127 +++++++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1809c147cbd..302e16c0eb3 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1477,10 +1477,12 @@ static void test_GetMouseMovePointsEx(void) { #define BUFLIM 64 #define MYERROR 0xdeadbeef - int count, retval; + int count, retval, last_error; + DWORD old_time, new_time; MOUSEMOVEPOINT in; MOUSEMOVEPOINT out[200]; POINT point; + int i, j, expected; /* Get a valid content for the input struct */ if(!GetCursorPos(&point)) { @@ -1605,6 +1607,129 @@ static void test_GetMouseMovePointsEx(void) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + old_time = GetTickCount(); + for (i = 0; i < 64; i++) { + SetCursorPos((i+1)*2, (i+1)); + } + + count = 64; + in.x = (63+1)*2; + in.y = (63+1); + in.time = 0; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 64, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + in.x = (31+1)*2; + in.y = (31+1); + in.time = 0; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 32, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + in.time = old_time; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 32, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 1) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 1; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + Sleep(2); + + SetCursorPos(in.x, in.y); + new_time = GetTickCount(); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 31, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + expected = (i + 2) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + expected = i + 2; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + + in.time = new_time; + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + last_error = GetLastError(); + todo_wine ok(retval == 64, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + if (retval == -1) { + ok(last_error == ERROR_POINT_NOT_FOUND, "unexpected error %u\n", last_error); + } else { + for (i = 0; i < retval; i++) { + j = retval - i - 1; + + if (j == 0) + expected = in.x; + else if (j == 63) + expected = 4; + else + expected = (i + 2) * 2; + ok(out[j].x == expected, "expected [%d].x = %d, got %d\n", j, expected, out[j].x); + + if (j == 0) + expected = in.y; + else if (j == 63) + expected = 2; + else + expected = i + 2; + ok(out[j].y == expected, "expected [%d].y = %d, got %d\n", j, expected, out[j].y); + } + } + #undef BUFLIM #undef MYERROR } -- 2.28.0

2 1

[PATCH 1/2] kernel32/profile: Make PROFILESECTION::name be a pointer.
by Carlos Rivera Sept. 12, 2020

Sept. 12, 2020

Instead of an array of size 1. And instead of allocating enough memory after the struct to hold the actual array. This commit then creates two new functions: 1. To allocate both the struct and the memory to which name now points. 2. To free the memory to which name points and to free the struct itself. The advantage of this is that we will be able to distinguish a profile section which has no name, i.e. no section, but may contain keys. From a profile section with an empty name ([]). These are pathological cases found in the tests. This is also more idiomatic. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> --- dlls/kernel32/profile.c | 90 +++++++++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 16253a685c..8bc7533599 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -51,14 +51,14 @@ typedef struct tagPROFILEKEY { WCHAR *value; struct tagPROFILEKEY *next; - WCHAR name[1]; + WCHAR name[1]; /* TODO: make it a pointer like in PROFILESECTION */ } PROFILEKEY; typedef struct tagPROFILESECTION { struct tagPROFILEKEY *key; struct tagPROFILESECTION *next; - WCHAR name[1]; + WCHAR *name; } PROFILESECTION; @@ -72,6 +72,51 @@ typedef struct } PROFILE; +static PROFILESECTION *new_PROFILESECTION(const WCHAR *name, int len) +{ + /* len should not include a terminating character */ + + PROFILESECTION *section; + + section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) ); + if (section) + { + section->key = NULL; + section->next = NULL; + section->name = NULL; + + if (name && len > 0) + { + if (!(section->name = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) + { + HeapFree(GetProcessHeap(), 0, section); + section = NULL; + } + else + { + memcpy(section->name, name, len * sizeof(WCHAR)); + section->name[len] = '\0'; + } + } + } + + return section; +} + +static void free_PROFILESECTION(PROFILESECTION *section) +{ + if (section) + { + if (section->name) + { + HeapFree(GetProcessHeap(), 0, section->name); + } + + HeapFree(GetProcessHeap(), 0, section); + } +} + + #define N_CACHED_PROFILES 10 /* Cached profile files */ @@ -203,7 +248,7 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING { int len = 0; - if (section->name[0]) len += strlenW(section->name) + 4; + if (section->name && section->name[0]) len += strlenW(section->name) + 4; for (key = section->key; key; key = key->next) { @@ -215,7 +260,7 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING if (!buffer) return; p = buffer; - if (section->name[0]) + if (section->name && section->name[0]) { *p++ = '['; strcpyW( p, section->name ); @@ -263,7 +308,7 @@ static void PROFILE_Free( PROFILESECTION *section ) HeapFree( GetProcessHeap(), 0, key ); } next_section = section->next; - HeapFree( GetProcessHeap(), 0, section ); + free_PROFILESECTION(section); } } @@ -383,7 +428,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) return NULL; } - first_section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) ); + first_section = new_PROFILESECTION(NULL, 0); if(first_section == NULL) { if (szFile != pBuffer) @@ -391,9 +436,6 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } - first_section->name[0] = 0; - first_section->key = NULL; - first_section->next = NULL; next_section = &first_section->next; next_key = &first_section->key; prev_key = NULL; @@ -424,14 +466,10 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) { szLineStart++; len -= 2; - /* no need to allocate +1 for NULL terminating character as - * already included in structure */ - if (!(section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) + len * sizeof(WCHAR) ))) + + if (!(section = new_PROFILESECTION(szLineStart, len))) break; - memcpy(section->name, szLineStart, len * sizeof(WCHAR)); - section->name[len] = '\0'; - section->key = NULL; - section->next = NULL; + *next_section = section; next_section = &section->next; next_key = &section->key; @@ -499,7 +537,7 @@ static BOOL PROFILE_DeleteKey( PROFILESECTION **section, { while (*section) { - if (!strcmpiW( (*section)->name, section_name )) + if ((*section)->name && !strcmpiW( (*section)->name, section_name )) { PROFILEKEY **key = &(*section)->key; while (*key) @@ -531,7 +569,7 @@ static void PROFILE_DeleteAllKeys( LPCWSTR section_name) PROFILESECTION **section= &CurProfile->section; while (*section) { - if (!strcmpiW( (*section)->name, section_name )) + if ((*section)->name && !strcmpiW( (*section)->name, section_name )) { PROFILEKEY **key = &(*section)->key; while (*key) @@ -577,7 +615,8 @@ static PROFILEKEY *PROFILE_Find( PROFILESECTION **section, LPCWSTR section_name, while (*section) { - if (!strncmpiW((*section)->name, section_name, seclen) && + if ((*section)->name && + !strncmpiW((*section)->name, section_name, seclen) && ((*section)->name)[seclen] == '\0') { PROFILEKEY **key = &(*section)->key; @@ -608,14 +647,13 @@ static PROFILEKEY *PROFILE_Find( PROFILESECTION **section, LPCWSTR section_name, section = &(*section)->next; } if (!create) return NULL; - *section = HeapAlloc( GetProcessHeap(), 0, sizeof(PROFILESECTION) + strlenW(section_name) * sizeof(WCHAR) ); + *section = new_PROFILESECTION(section_name, strlenW(section_name)); if(*section == NULL) return NULL; - strcpyW( (*section)->name, section_name ); - (*section)->next = NULL; + if (!((*section)->key = HeapAlloc( GetProcessHeap(), 0, sizeof(PROFILEKEY) + strlenW(key_name) * sizeof(WCHAR) ))) { - HeapFree(GetProcessHeap(), 0, *section); + free_PROFILESECTION(*section); return NULL; } strcpyW( (*section)->key->name, key_name ); @@ -855,7 +893,7 @@ static INT PROFILE_GetSection( const WCHAR *filename, LPCWSTR section_name, for (section = CurProfile->section; section; section = section->next) { - if (!strcmpiW( section->name, section_name )) + if (section->name && !strcmpiW( section->name, section_name )) { UINT oldlen = len; for (key = section->key; key; key = key->next) @@ -914,7 +952,7 @@ static BOOL PROFILE_DeleteSection( const WCHAR *filename, const WCHAR *name ) for (section = &CurProfile->section; *section; section = &(*section)->next) { - if (!strcmpiW( (*section)->name, name )) + if ((*section)->name && !strcmpiW( (*section)->name, name )) { PROFILESECTION *to_del = *section; *section = to_del->next; @@ -951,7 +989,7 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) buf=buffer; section = CurProfile->section; while ((section!=NULL)) { - if (section->name[0]) { + if (section->name && section->name[0]) { tmplen = strlenW(section->name)+1; if (tmplen >= buflen) { if (buflen > 0) { -- 2.28.0

2 2

Wine staging 5.17 release
by Alistair Leslie-Hughes Sept. 12, 2020

Sept. 12, 2020

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.17 (649 patches are applied to wine vanilla) NOTE: Currently the esync patchset has been disabled until it can be rebased. Upstreamed (Either directly from staging or fixed with a similar patch). * winegstreamer: Implement stub bytestream handler and source. * winegstreamer: Implement IMFMediaSource::Shutdown. * ntdll: Return buffer filled with random values from SystemInterruptInformation. * advapi: Trigger write watches before passing userdata pointer to read syscall. Added: * [49740] windows.media.speech: New DLL * [49740] msxml3: Implement FreeThreadedXMLHTTP60. Updated: * mfplat-streaming-support * ntdll-ForceBottomUpAlloc Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

2 2

[PATCH v2 1/3] ws2_32: Extend WS_EnterSingleProtocolW
by Robin Ebert Sept. 12, 2020

Sept. 12, 2020

WS_EnterSingleProtocol needs to handle addressfamily as the WSAPROTOCOL_INFOW struct differs among different addressfamilies. This renders the old WS_EnumProtocols implementation useless resulting in missing WS_EnumProtocolsA and WS_EnumProtocolsW implementations. Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> --- v2: Report not supported error in WS_EnumProtocols --- dlls/ws2_32/socket.c | 225 +++++++++++++++++++++++++++++-------------- 1 file changed, 151 insertions(+), 74 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4d2afa94..c67527d0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2158,23 +2158,20 @@ static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPR } /***************************************************************************** - * WS_EnterSingleProtocolW [internal] + * WS_AF_INET_EnterSingleProtocolW [internal] * * enters the protocol information of one given protocol into the given * buffer. * + * HANDLES AF_INET + * * RETURNS * TRUE if a protocol was entered into the buffer. * - * BUGS - * - only implemented for IPX, SPX, SPXII, TCP, UDP - * - there is no check that the operating system supports the returned - * protocols */ -static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) +static BOOL WS_AF_INET_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) { - memset( info, 0, sizeof(WSAPROTOCOL_INFOW) ); - info->iProtocol = protocol; + info->iAddressFamily = WS_AF_INET; switch (protocol) { @@ -2187,7 +2184,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x10; info->iSocketType = WS_SOCK_STREAM; @@ -2203,7 +2199,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x10; info->iSocketType = WS_SOCK_DGRAM; @@ -2211,6 +2206,85 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) strcpyW( info->szProtocol, NameUdpW ); break; + default: + FIXME("unknown Protocol <0x%08x>\n", protocol); + return FALSE; + } + return TRUE; +} +/***************************************************************************** + * WS_AF_INET6_EnterSingleProtocolW [internal] + * + * enters the protocol information of one given protocol into the given + * buffer. + * + * HANDLES AF_INET6 + * + * RETURNS + * TRUE if a protocol was entered into the buffer. + * + */ +static BOOL WS_AF_INET6_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) +{ + info->iAddressFamily = WS_AF_INET6; + + switch (protocol) + { + case WS_IPPROTO_TCP: + info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | + XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | + XP1_GUARANTEED_DELIVERY; + info->ProviderId = ProviderIdIP; + info->dwCatalogEntryId = 0x3ec; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; + info->ProtocolChain.ChainLen = 1; + info->iVersion = 2; + info->iMaxSockAddr = 0x1c; + info->iMinSockAddr = 0x1c; + info->iSocketType = WS_SOCK_STREAM; + strcpyW( info->szProtocol, NameTcpW ); + break; + + case WS_IPPROTO_UDP: + info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | + XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | + XP1_CONNECTIONLESS; + info->ProviderId = ProviderIdIP; + info->dwCatalogEntryId = 0x3ea; + info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; + info->ProtocolChain.ChainLen = 1; + info->iVersion = 2; + info->iMaxSockAddr = 0x1c; + info->iMinSockAddr = 0x1c; + info->iSocketType = WS_SOCK_DGRAM; + info->dwMessageSize = 0xffbb; + strcpyW( info->szProtocol, NameUdpW ); + break; + + default: + FIXME("unknown Protocol <0x%08x>\n", protocol); + return FALSE; + } + return TRUE; +} +/***************************************************************************** + * WS_AF_IPX_EnterSingleProtocolW [internal] + * + * enters the protocol information of one given protocol into the given + * buffer. + * + * HANDLES AF_IPX + * + * RETURNS + * TRUE if a protocol was entered into the buffer. + * + */ +static BOOL WS_AF_IPX_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) +{ + info->iAddressFamily = WS_AF_IPX; + + switch (protocol) + { case WS_NSPROTO_IPX: info->dwServiceFlags1 = XP1_PARTIAL_MESSAGE | XP1_SUPPORT_BROADCAST | XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | @@ -2220,7 +2294,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; info->iSocketType = WS_SOCK_DGRAM; @@ -2238,7 +2311,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; info->iSocketType = WS_SOCK_SEQPACKET; @@ -2255,7 +2327,6 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) info->dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO; info->ProtocolChain.ChainLen = 1; info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; info->iMaxSockAddr = 0x10; info->iMinSockAddr = 0x0e; info->iSocketType = WS_SOCK_SEQPACKET; @@ -2269,85 +2340,94 @@ static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) } return TRUE; } - /***************************************************************************** - * WS_EnterSingleProtocolA [internal] + * WS_EnterSingleProtocolW [internal] * - * see function WS_EnterSingleProtocolW + * enters the protocol information of one given protocol into the given + * buffer. * + * RETURNS + * count of returned WSAPROTOCOL_INFOW structs + * + * BUGS + * - only implemented for IPX, SPX, SPXII, TCP, UDP + * - there is no check that the operating system supports the returned + * protocols */ -static BOOL WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) +static INT WS_EnterSingleProtocolW( INT address_family, INT protocol, WSAPROTOCOL_INFOW info[], INT* info_size ) { - WSAPROTOCOL_INFOW infow; - INT ret; - memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); + if(address_family) + { + memset( info, 0, sizeof(WSAPROTOCOL_INFOW) ); + info->iProtocol = protocol; - ret = WS_EnterSingleProtocolW( protocol, &infow ); - if (ret) + switch (address_family) + { + case WS_AF_INET: + WS_AF_INET_EnterSingleProtocolW(protocol, info); + break; + case WS_AF_INET6: + WS_AF_INET6_EnterSingleProtocolW(protocol, info); + break; + case WS_AF_IPX: + WS_AF_IPX_EnterSingleProtocolW(protocol, info); + break; + default: + FIXME("unhandled addressfamily <0x%08x>\n", address_family); + return 0; + } + return 1; + } + else { - /* convert the structure from W to A */ - memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); - WideCharToMultiByte( CP_ACP, 0, infow.szProtocol, -1, - info->szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL ); + FIXME("Unspecified address_family not implemented yet\n"); + return 0; } - - return ret; } -static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) +/***************************************************************************** + * WS_EnterSingleProtocolA [internal] + * + * see function WS_EnterSingleProtocolW + * + */ +static INT WS_EnterSingleProtocolA( INT addressfamily, INT protocol, WSAPROTOCOL_INFOA* info , INT* info_size) { - INT i = 0, items = 0; - DWORD size = 0; - union _info - { - LPWSAPROTOCOL_INFOA a; - LPWSAPROTOCOL_INFOW w; - } info; - info.w = buffer; + WSAPROTOCOL_INFOW* infow; + INT ret, i; - if (!protocols) protocols = valid_protocols; + infow = HeapAlloc(GetProcessHeap(), 0, sizeof(WSAPROTOCOL_INFOW) * *info_size); - while (protocols[i]) + ret = WS_EnterSingleProtocolW( addressfamily, protocol, infow, info_size ); + if (ret) { - if(supported_protocol(protocols[i++])) - items++; + for(i = 0; i < ret; i++) + { + /* convert the structure from W to A */ + memcpy( &info[i], &infow[i], FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); + WideCharToMultiByte( CP_ACP, 0, infow[i].szProtocol, -1, + info[i].szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL ); + } } - size = items * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); - - TRACE("unicode %d, protocols %p, buffer %p, length %p %d, items %d, required %d\n", - unicode, protocols, buffer, len, len ? *len : 0, items, size); + HeapFree(GetProcessHeap(), 0, infow); - if (*len < size || !buffer) - { - *len = size; - SetLastError(WSAENOBUFS); - return SOCKET_ERROR; - } + return ret; +} - for (i = items = 0; protocols[i]; i++) - { - if (!supported_protocol(protocols[i])) continue; - if (unicode) - { - if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] )) - items++; - } - else - { - if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] )) - items++; - } - } - return items; +static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) +{ + FIXME("Not implemented\n"); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; } static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) { NTSTATUS status; int address_family; - int socket_type; int protocol; + int buffer_size = 1; *size = unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA); memset(buffer, 0, *size); @@ -2359,7 +2439,6 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i if (!status) { address_family = convert_af_u2w(reply->family); - socket_type = convert_socktype_u2w(reply->type); protocol = convert_proto_u2w(reply->protocol); } } @@ -2373,12 +2452,9 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i } if (unicode) - WS_EnterSingleProtocolW( protocol, buffer); + WS_EnterSingleProtocolW( address_family, protocol, buffer, &buffer_size); else - WS_EnterSingleProtocolA( protocol, (WSAPROTOCOL_INFOA *)buffer); - buffer->iAddressFamily = address_family; - buffer->iSocketType = socket_type; - buffer->iProtocol = protocol; + WS_EnterSingleProtocolA( address_family, protocol, (WSAPROTOCOL_INFOA *)buffer, &buffer_size); return TRUE; } @@ -7578,6 +7654,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, { int autoproto = protocol; WSAPROTOCOL_INFOW infow; + int infow_size = 1; /* default to the first valid protocol */ if (!autoproto) @@ -7585,7 +7662,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, else if(IS_IPX_PROTO(autoproto)) autoproto = WS_NSPROTO_IPX; - if (WS_EnterSingleProtocolW(autoproto, &infow)) + if (WS_EnterSingleProtocolW(af, autoproto, &infow, &infow_size)) { type = infow.iSocketType; -- 2.20.1

4 5