March 2015 - Wine-commits - list.winehq.org

Andrew Eikum : shell32: Also return RelativePath in GetFolderDefinition.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 103f158c63947dcd4a158157b46d19be8f57ec63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=103f158c63947dcd4a158157b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 2 09:28:43 2015 -0600 shell32: Also return RelativePath in GetFolderDefinition. --- dlls/shell32/shellpath.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8724158..493ab8b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3709,6 +3709,8 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( get_known_folder_dword(knownfolder->registryPath, szAttributes, &pKFD->dwAttributes); + get_known_folder_wstr(knownfolder->registryPath, szRelativePath, &pKFD->pszRelativePath); + return S_OK; }

1 0

Andrew Eikum : shell32: Fall back on CSIDL path for knownfolders without a path in the registry.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: db35807eb02bb8ee2ba50e7ecee46341f0999d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db35807eb02bb8ee2ba50e7ec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 2 09:28:55 2015 -0600 shell32: Fall back on CSIDL path for knownfolders without a path in the registry. --- dlls/shell32/shellpath.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 493ab8b..84e663b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3589,7 +3589,7 @@ static HRESULT get_known_folder_path_by_id( DWORD dwFlags, LPWSTR *ppszPath) { - HRESULT hr; + HRESULT hr = E_FAIL; WCHAR sGuid[39]; DWORD dwAttributes; @@ -3603,7 +3603,8 @@ static HRESULT get_known_folder_path_by_id( hr = get_known_folder_path(sGuid, lpRegistryPath, ppszPath); } /* in other case, use older way */ - else + + if(FAILED(hr)) hr = SHGetKnownFolderPath( folderId, dwFlags, NULL, ppszPath ); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : scrrun: Implement Keys() and Items() of dictionary.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 1c813d5be31d1e5d1cca4a5dd6928baf1af4133f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c813d5be31d1e5d1cca4a5dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:22:32 2015 +0300 scrrun: Implement Keys() and Items() of dictionary. --- dlls/scrrun/dictionary.c | 72 ++++++++++++++++++++++++++++++++++++++---- dlls/scrrun/tests/dictionary.c | 10 ++---- 2 files changed, 68 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 7c776ee..6543aa0 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -381,13 +381,43 @@ static HRESULT WINAPI dictionary_Exists(IDictionary *iface, VARIANT *key, VARIAN return S_OK; } -static HRESULT WINAPI dictionary_Items(IDictionary *iface, VARIANT *pItemsArray) +static HRESULT WINAPI dictionary_Items(IDictionary *iface, VARIANT *items) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; + SAFEARRAYBOUND bound; + SAFEARRAY *sa; + VARIANT *v; + HRESULT hr; + LONG i; - FIXME("(%p)->(%p)\n", This, pItemsArray); + TRACE("(%p)->(%p)\n", This, items); - return E_NOTIMPL; + if (!items) + return S_OK; + + bound.lLbound = 0; + bound.cElements = This->count; + sa = SafeArrayCreate(VT_VARIANT, 1, &bound); + if (!sa) + return E_OUTOFMEMORY; + + hr = SafeArrayAccessData(sa, (void**)&v); + if (FAILED(hr)) { + SafeArrayDestroy(sa); + return hr; + } + + i = 0; + LIST_FOR_EACH_ENTRY(pair, &This->pairs, struct keyitem_pair, entry) { + VariantCopy(&v[i], &pair->item); + i++; + } + SafeArrayUnaccessData(sa); + + V_VT(items) = VT_ARRAY|VT_VARIANT; + V_ARRAY(items) = sa; + return S_OK; } static HRESULT WINAPI dictionary_put_Key(IDictionary *iface, VARIANT *Key, VARIANT *rhs) @@ -399,13 +429,43 @@ static HRESULT WINAPI dictionary_put_Key(IDictionary *iface, VARIANT *Key, VARIA return E_NOTIMPL; } -static HRESULT WINAPI dictionary_Keys(IDictionary *iface, VARIANT *pKeysArray) +static HRESULT WINAPI dictionary_Keys(IDictionary *iface, VARIANT *keys) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; + SAFEARRAYBOUND bound; + SAFEARRAY *sa; + VARIANT *v; + HRESULT hr; + LONG i; - FIXME("(%p)->(%p)\n", This, pKeysArray); + TRACE("(%p)->(%p)\n", This, keys); - return E_NOTIMPL; + if (!keys) + return S_OK; + + bound.lLbound = 0; + bound.cElements = This->count; + sa = SafeArrayCreate(VT_VARIANT, 1, &bound); + if (!sa) + return E_OUTOFMEMORY; + + hr = SafeArrayAccessData(sa, (void**)&v); + if (FAILED(hr)) { + SafeArrayDestroy(sa); + return hr; + } + + i = 0; + LIST_FOR_EACH_ENTRY(pair, &This->pairs, struct keyitem_pair, entry) { + VariantCopy(&v[i], &pair->key); + i++; + } + SafeArrayUnaccessData(sa); + + V_VT(keys) = VT_ARRAY|VT_VARIANT; + V_ARRAY(keys) = sa; + return S_OK; } static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *key) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 74ab7b9..3637356 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -495,15 +495,12 @@ static void test_Keys(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDictionary_Keys(dict, NULL); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); VariantInit(&keys); hr = IDictionary_Keys(dict, &keys); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); -} VariantClear(&keys); V_VT(&key) = VT_R4; @@ -514,12 +511,9 @@ todo_wine { VariantInit(&keys); hr = IDictionary_Keys(dict, &keys); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); -} -if (hr == S_OK) -{ + VariantInit(&key); index = 0; hr = SafeArrayGetElement(V_ARRAY(&keys), &index, &key); @@ -532,7 +526,7 @@ if (hr == S_OK) hr = SafeArrayGetUBound(V_ARRAY(&keys), 1, &index); ok(hr == S_OK, "got 0x%08x\n", hr); ok(index == 0, "got %d\n", index); -} + VariantClear(&keys); IDictionary_Release(dict);

1 0

Nikolay Sivov : scrrun: Implement put_Key() for dictionary.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: a25f1931a61b2536ab036b7b02322b053a8ddab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25f1931a61b2536ab036b7b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:25:06 2015 +0300 scrrun: Implement put_Key() for dictionary. --- dlls/scrrun/dictionary.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 6543aa0..8d534e7 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 Alistair Leslie-Hughes + * Copyright 2015 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -420,13 +421,28 @@ static HRESULT WINAPI dictionary_Items(IDictionary *iface, VARIANT *items) return S_OK; } -static HRESULT WINAPI dictionary_put_Key(IDictionary *iface, VARIANT *Key, VARIANT *rhs) +static HRESULT WINAPI dictionary_put_Key(IDictionary *iface, VARIANT *key, VARIANT *newkey) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; + VARIANT empty; + HRESULT hr; - FIXME("(%p)->(%p %p)\n", This, Key, rhs); + TRACE("(%p)->(%s %s)\n", This, debugstr_variant(key), debugstr_variant(newkey)); - return E_NOTIMPL; + if ((pair = get_keyitem_pair(This, key))) { + /* found existing pair for a key, add new pair with new key + and old item and remove old pair after that */ + + hr = IDictionary_Add(iface, newkey, &pair->item); + if (FAILED(hr)) + return hr; + + return IDictionary_Remove(iface, key); + } + + VariantInit(&empty); + return IDictionary_Add(iface, newkey, &empty); } static HRESULT WINAPI dictionary_Keys(IDictionary *iface, VARIANT *keys)

1 0

Nikolay Sivov : scrrun/tests: A test for adding BYREF item.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 2d15758c38b624c7ee67042c972cb63c2589d549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d15758c38b624c7ee67042c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:26:26 2015 +0300 scrrun/tests: A test for adding BYREF item. --- dlls/scrrun/tests/dictionary.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 3637356..927ac05 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -589,6 +589,35 @@ static void test_Item(void) IDictionary_Release(dict); } +static void test_Add(void) +{ + static const WCHAR testW[] = {'t','e','s','t','W',0}; + VARIANT key, item; + IDictionary *dict; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(testW); + V_VT(&key) = VT_I2; + V_I2(&key) = 1; + V_VT(&item) = VT_BSTR|VT_BYREF; + V_BSTRREF(&item) = &str; + hr = IDictionary_Add(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_get_Item(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&item) == VT_BSTR, "got %d\n", V_VT(&item)); + + SysFreeString(str); + + IDictionary_Release(dict); +} + START_TEST(dictionary) { IDispatch *disp; @@ -612,6 +641,7 @@ START_TEST(dictionary) test_Keys(); test_Remove(); test_Item(); + test_Add(); CoUninitialize(); }

1 0

Nikolay Sivov : scrrun: Implement GetExtensionName().
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 3814e0229dc8248e0df915eb84dacf092f58da6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3814e0229dc8248e0df915eb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 21:06:37 2015 +0300 scrrun: Implement GetExtensionName(). --- dlls/scrrun/filesystem.c | 22 ++++++++++++++++++---- dlls/scrrun/tests/filesystem.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f6f7703..74e5432 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3103,12 +3103,26 @@ static HRESULT WINAPI filesys_GetBaseName(IFileSystem3 *iface, BSTR Path, return S_OK; } -static HRESULT WINAPI filesys_GetExtensionName(IFileSystem3 *iface, BSTR Path, - BSTR *pbstrResult) +static HRESULT WINAPI filesys_GetExtensionName(IFileSystem3 *iface, BSTR path, + BSTR *ext) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + INT len; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(path), ext); + + *ext = NULL; + len = SysStringLen(path); + while (len) { + if (path[len-1] == '.') { + *ext = SysAllocString(&path[len]); + if (!*ext) + return E_OUTOFMEMORY; + break; + } + len--; + } + + return S_OK; } static HRESULT WINAPI filesys_GetAbsolutePathName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b3f3bee..210b90c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1865,6 +1865,40 @@ static void test_SerialNumber(void) IEnumVARIANT_Release(iter); } +static const struct extension_test { + WCHAR path[20]; + WCHAR ext[10]; +} extension_tests[] = { + { {'n','o','e','x','t',0}, {0} }, + { {'n','.','o','.','e','x','t',0}, {'e','x','t',0} }, + { {'n','.','o','.','e','X','t',0}, {'e','X','t',0} }, + { { 0 } } +}; + +static void test_GetExtensionName(void) +{ + BSTR path, ext; + HRESULT hr; + int i; + + for (i = 0; i < sizeof(extension_tests)/sizeof(extension_tests[0]); i++) { + + path = SysAllocString(extension_tests[i].path); + ext = NULL; + hr = IFileSystem3_GetExtensionName(fs3, path, &ext); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (*extension_tests[i].ext) + ok(!lstrcmpW(ext, extension_tests[i].ext), "%d: path %s, got %s, expected %s\n", i, + wine_dbgstr_w(path), wine_dbgstr_w(ext), wine_dbgstr_w(extension_tests[i].ext)); + else + ok(ext == NULL, "%d: path %s, got %s, expected %s\n", i, + wine_dbgstr_w(path), wine_dbgstr_w(ext), wine_dbgstr_w(extension_tests[i].ext)); + + SysFreeString(path); + SysFreeString(ext); + } +} + START_TEST(filesystem) { HRESULT hr; @@ -1899,6 +1933,7 @@ START_TEST(filesystem) test_Read(); test_GetDriveName(); test_SerialNumber(); + test_GetExtensionName(); IFileSystem3_Release(fs3);

1 0

Alexandre Julliard : ws2_32: Add a common header to the async I/ O structures.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 9fa69b586810b35c34380b64f3c6b52edb6cfb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa69b586810b35c34380b64f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 15:33:21 2015 +0900 ws2_32: Add a common header to the async I/O structures. --- dlls/ws2_32/socket.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index faf2ec1..55f4865 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -330,8 +330,14 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) * Async IO declarations ****************************************************************/ -typedef struct ws2_async +struct ws2_async_io { + struct ws2_async_io *next; +}; + +struct ws2_async +{ + struct ws2_async_io io; HANDLE hSocket; int type; LPWSAOVERLAPPED user_overlapped; @@ -349,10 +355,11 @@ typedef struct ws2_async unsigned int n_iovecs; unsigned int first_iovec; struct iovec iovec[1]; -} ws2_async; +}; -typedef struct ws2_accept_async +struct ws2_accept_async { + struct ws2_async_io io; HANDLE listen_socket; HANDLE accept_socket; LPOVERLAPPED user_overlapped; @@ -362,7 +369,7 @@ typedef struct ws2_accept_async int local_len; int remote_len; struct ws2_async *read; -} ws2_accept_async; +}; /****************************************************************/ @@ -1885,7 +1892,7 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i /* user APC called upon async completion */ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) { - ws2_async *wsa = arg; + struct ws2_async *wsa = arg; if (wsa->completion_func) wsa->completion_func( NtStatusToWSAError(iosb->u.Status), iosb->Information, wsa->user_overlapped, @@ -1973,7 +1980,7 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) */ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status, void **apc) { - ws2_async* wsa = user; + struct ws2_async *wsa = user; int result = 0, fd; switch (status) @@ -2206,7 +2213,7 @@ static int WS2_send( int fd, struct ws2_async *wsa ) */ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status, void **apc) { - ws2_async* wsa = user; + struct ws2_async *wsa = user; int result = 0, fd; switch (status) @@ -2259,7 +2266,7 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu */ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) { - ws2_async* wsa = user; + struct ws2_async *wsa = user; int fd, err = 1; switch (status) @@ -3794,7 +3801,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s wsa->completion_func = completion; io = (overlapped ? (PIO_STATUS_BLOCK)overlapped : &wsa->local_iosb); - status = NtDeviceIoControlFile( handle, event, (PIO_APC_ROUTINE)ws2_async_apc, wsa, io, code, + status = NtDeviceIoControlFile( handle, event, ws2_async_apc, wsa, io, code, in_buff, in_size, out_buff, out_size ); if (status == STATUS_NOT_SUPPORTED) {

1 0

Alexandre Julliard : ws2_32: Add a separate structure for async shutdowns.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: e23233d79192309fa258d911cda9a3d8a61b5d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23233d79192309fa258d911c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 15:30:13 2015 +0900 ws2_32: Add a separate structure for async shutdowns. Conflicts: dlls/ws2_32/socket.c --- dlls/ws2_32/socket.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 55f4865..01e9869 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -335,11 +335,18 @@ struct ws2_async_io struct ws2_async_io *next; }; +struct ws2_async_shutdown +{ + struct ws2_async_io io; + HANDLE hSocket; + IO_STATUS_BLOCK iosb; + int type; +}; + struct ws2_async { struct ws2_async_io io; HANDLE hSocket; - int type; LPWSAOVERLAPPED user_overlapped; LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func; IO_STATUS_BLOCK local_iosb; @@ -2266,7 +2273,7 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu */ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) { - struct ws2_async *wsa = user; + struct ws2_async_shutdown *wsa = user; int fd, err = 1; switch (status) @@ -2297,25 +2304,24 @@ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS */ static int WS2_register_async_shutdown( SOCKET s, int type ) { - struct ws2_async *wsa; + struct ws2_async_shutdown *wsa; NTSTATUS status; TRACE("s %04lx type %d\n", s, type); - wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )); + wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); if ( !wsa ) return WSAEFAULT; - wsa->hSocket = SOCKET2HANDLE(s); - wsa->type = type; - wsa->completion_func = NULL; + wsa->hSocket = SOCKET2HANDLE(s); + wsa->type = type; SERVER_START_REQ( register_async ) { req->type = type; req->async.handle = wine_server_obj_handle( wsa->hSocket ); req->async.callback = wine_server_client_ptr( WS2_async_shutdown ); - req->async.iosb = wine_server_client_ptr( &wsa->local_iosb ); + req->async.iosb = wine_server_client_ptr( &wsa->iosb ); req->async.arg = wine_server_client_ptr( wsa ); req->async.cvalue = 0; status = wine_server_call( req );

1 0

Alexandre Julliard : ws2_32: Don' t queue a user APC when there is no callback function.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 4273b0d938b9ed64c0edefdeb96cda33d1479bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4273b0d938b9ed64c0edefdeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 15:30:38 2015 +0900 ws2_32: Don't queue a user APC when there is no callback function. --- dlls/ws2_32/socket.c | 71 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 01e9869..f1f00eb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -378,6 +378,34 @@ struct ws2_accept_async struct ws2_async *read; }; +static struct ws2_async_io *async_io_freelist; + +static void release_async_io( struct ws2_async_io *io ) +{ + for (;;) + { + struct ws2_async_io *next = async_io_freelist; + io->next = next; + if (interlocked_cmpxchg_ptr( (void **)&async_io_freelist, io, next ) == next) return; + } +} + +static struct ws2_async_io *alloc_async_io( DWORD size ) +{ + /* first free remaining previous fileinfos */ + + struct ws2_async_io *io = interlocked_xchg_ptr( (void **)&async_io_freelist, NULL ); + + while (io) + { + struct ws2_async_io *next = io->next; + HeapFree( GetProcessHeap(), 0, io ); + io = next; + } + + return HeapAlloc( GetProcessHeap(), 0, size ); +} + /****************************************************************/ /* ----------------------------------- internal data */ @@ -1904,7 +1932,7 @@ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserv if (wsa->completion_func) wsa->completion_func( NtStatusToWSAError(iosb->u.Status), iosb->Information, wsa->user_overlapped, wsa->flags ); - HeapFree( GetProcessHeap(), 0, wsa ); + release_async_io( &wsa->io ); } /*********************************************************************** @@ -2022,20 +2050,14 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat { iosb->u.Status = status; iosb->Information = result; - *apc = ws2_async_apc; + if (wsa->completion_func) + *apc = ws2_async_apc; + else + release_async_io( &wsa->io ); } return status; } -/* user APC called upon async accept completion */ -static void WINAPI ws2_async_accept_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) -{ - struct ws2_accept_async *wsa = arg; - - HeapFree( GetProcessHeap(), 0, wsa->read ); - HeapFree( GetProcessHeap(), 0, wsa ); -} - /*********************************************************************** * WS2_async_accept_recv (INTERNAL) * @@ -2056,7 +2078,7 @@ static NTSTATUS WS2_async_accept_recv( void *arg, IO_STATUS_BLOCK *iosb, NTSTATU if (wsa->cvalue) WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information ); - *apc = ws2_async_accept_apc; + release_async_io( &wsa->io ); return status; } @@ -2139,7 +2161,8 @@ finish: if (wsa->user_overlapped->hEvent) SetEvent(wsa->user_overlapped->hEvent); - *apc = ws2_async_accept_apc; + if (wsa->read) release_async_io( &wsa->read->io ); + release_async_io( &wsa->io ); return status; } @@ -2261,7 +2284,10 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu if (status != STATUS_PENDING) { iosb->u.Status = status; - *apc = ws2_async_apc; + if (wsa->completion_func) + *apc = ws2_async_apc; + else + release_async_io( &wsa->io ); } return status; } @@ -2293,7 +2319,7 @@ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS } iosb->u.Status = status; iosb->Information = 0; - *apc = ws2_async_apc; + release_async_io( &wsa->io ); return status; } @@ -2309,7 +2335,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) TRACE("s %04lx type %d\n", s, type); - wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); + wsa = (struct ws2_async_shutdown *)alloc_async_io( sizeof(*wsa) ); if ( !wsa ) return WSAEFAULT; @@ -2436,7 +2462,7 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW } release_sock_fd( acceptor, fd ); - wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); + wsa = (struct ws2_accept_async *)alloc_async_io( sizeof(*wsa) ); if(!wsa) { SetLastError(WSAEFAULT); @@ -2456,7 +2482,7 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW if (wsa->data_len) { /* set up a read request if we need it */ - wsa->read = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[1]) ); + wsa->read = (struct ws2_async *)alloc_async_io( offsetof(struct ws2_async, iovec[1]) ); if (!wsa->read) { HeapFree( GetProcessHeap(), 0, wsa ); @@ -2472,6 +2498,7 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW wsa->read->control = NULL; wsa->read->n_iovecs = 1; wsa->read->first_iovec = 0; + wsa->read->completion_func = NULL; wsa->read->iovec[0].iov_base = wsa->buf; wsa->read->iovec[0].iov_len = wsa->data_len; } @@ -2915,7 +2942,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n FD_WINE_CONNECTED|FD_WINE_LISTENING); /* Indirectly call WSASend */ - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )))) + if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof( struct ws2_async, iovec[1] )))) { SetLastError(WSAEFAULT); } @@ -3800,7 +3827,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s NTSTATUS status; PIO_STATUS_BLOCK io; - if (!(wsa = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*wsa) ))) + if (!(wsa = (struct ws2_async *)alloc_async_io( sizeof(*wsa) ))) return WSA_NOT_ENOUGH_MEMORY; wsa->hSocket = handle; wsa->user_overlapped = overlapped; @@ -4651,7 +4678,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); if (overlapped || dwBufferCount > 1) { - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof(struct ws2_async, iovec[dwBufferCount])))) { err = WSAEFAULT; goto error; @@ -6666,7 +6693,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); if (overlapped || dwBufferCount > 1) { - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof(struct ws2_async, iovec[dwBufferCount])))) { err = WSAEFAULT; goto error;

1 0

Alexandre Julliard : server: Allow passing an argument for the user APC async I/O callbacks.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 8843bc144ddade9edf90d22d092bed16d77644ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8843bc144ddade9edf90d22d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 15:52:23 2015 +0900 server: Allow passing an argument for the user APC async I/O callbacks. --- dlls/ntdll/server.c | 1 + include/wine/server_protocol.h | 3 ++- server/async.c | 5 +++-- server/file.h | 2 +- server/protocol.def | 1 + server/thread.c | 4 ++-- server/trace.c | 1 + 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index aabda4f..e3f1694 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -401,6 +401,7 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) { result->async_io.total = iosb->Information; result->async_io.apc = wine_server_client_ptr( apc ); + result->async_io.arg = call->async_io.user; } break; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e0c3474..9d645d7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -554,6 +554,7 @@ typedef union enum apc_type type; unsigned int status; client_ptr_t apc; + client_ptr_t arg; unsigned int total; } async_io; struct @@ -5847,6 +5848,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 458 +#define SERVER_PROTOCOL_VERSION 459 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index 017419d..e403955 100644 --- a/server/async.c +++ b/server/async.c @@ -262,7 +262,8 @@ static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, } /* store the result of the client-side async callback */ -void async_set_result( struct object *obj, unsigned int status, apc_param_t total, client_ptr_t apc ) +void async_set_result( struct object *obj, unsigned int status, apc_param_t total, + client_ptr_t apc, client_ptr_t apc_arg ) { struct async *async = (struct async *)obj; @@ -293,7 +294,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota memset( &data, 0, sizeof(data) ); data.type = APC_USER; data.user.func = apc; - data.user.args[0] = async->data.arg; + data.user.args[0] = apc_arg; data.user.args[1] = async->data.iosb; data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); diff --git a/server/file.h b/server/file.h index ed6096f..85e4257 100644 --- a/server/file.h +++ b/server/file.h @@ -159,7 +159,7 @@ extern struct async *create_async( struct thread *thread, struct async_queue *qu const async_data_t *data ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, - apc_param_t total, client_ptr_t apc ); + apc_param_t total, client_ptr_t apc, client_ptr_t apc_arg ); extern int async_queued( struct async_queue *queue ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); diff --git a/server/protocol.def b/server/protocol.def index fc6bec5..f2a5a9a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -570,6 +570,7 @@ typedef union enum apc_type type; /* APC_ASYNC_IO */ unsigned int status; /* new status of async operation */ client_ptr_t apc; /* user APC to call */ + client_ptr_t arg; /* user APC argument */ unsigned int total; /* bytes transferred */ } async_io; struct diff --git a/server/thread.c b/server/thread.c index ba3f1d5..906b79d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1451,8 +1451,8 @@ DECL_HANDLER(select) else if (apc->result.type == APC_ASYNC_IO) { if (apc->owner) - async_set_result( apc->owner, apc->result.async_io.status, - apc->result.async_io.total, apc->result.async_io.apc ); + async_set_result( apc->owner, apc->result.async_io.status, apc->result.async_io.total, + apc->result.async_io.apc, apc->result.async_io.arg ); } wake_up( &apc->obj, 0 ); close_handle( current->process, req->prev_apc ); diff --git a/server/trace.c b/server/trace.c index dd20c04..1bda4cd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -227,6 +227,7 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) fprintf( stderr, "APC_ASYNC_IO,status=%s,total=%u", get_status_name( result->async_io.status ), result->async_io.total ); dump_uint64( ",apc=", &result->async_io.apc ); + dump_uint64( ",arg=", &result->async_io.arg ); break; case APC_VIRTUAL_ALLOC: fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s",

1 0