April 2014 - Wine-commits - list.winehq.org

Hans Leidekker : netprofm: Add a stub implementation of INetworkCostManager.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: c7690c70bab5f2a34bf30dd66821206811ba6af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7690c70bab5f2a34bf30dd66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 15 13:34:24 2014 +0200 netprofm: Add a stub implementation of INetworkCostManager. --- dlls/netprofm/list.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ dlls/netprofm/tests/list.c | 18 +++++++++++ include/netlistmgr.idl | 57 +++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 7c0b9e1..d5940f4 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -33,9 +33,76 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); struct list_manager { INetworkListManager INetworkListManager_iface; + INetworkCostManager INetworkCostManager_iface; LONG refs; }; +static inline struct list_manager *impl_from_INetworkCostManager( + INetworkCostManager *iface ) +{ + return CONTAINING_RECORD( iface, struct list_manager, INetworkCostManager_iface ); +} + +static HRESULT WINAPI cost_manager_QueryInterface( + INetworkCostManager *iface, + REFIID riid, + void **obj ) +{ + struct list_manager *mgr = impl_from_INetworkCostManager( iface ); + return INetworkListManager_QueryInterface( &mgr->INetworkListManager_iface, riid, obj ); +} + +static ULONG WINAPI cost_manager_AddRef( + INetworkCostManager *iface ) +{ + struct list_manager *mgr = impl_from_INetworkCostManager( iface ); + return INetworkListManager_AddRef( &mgr->INetworkListManager_iface ); +} + +static ULONG WINAPI cost_manager_Release( + INetworkCostManager *iface ) +{ + struct list_manager *mgr = impl_from_INetworkCostManager( iface ); + return INetworkListManager_Release( &mgr->INetworkListManager_iface ); +} + +static HRESULT WINAPI cost_manager_GetCost( + INetworkCostManager *iface, DWORD *pCost, NLM_SOCKADDR *pDestIPAddr) +{ + FIXME( "%p, %p, %p\n", iface, pCost, pDestIPAddr ); + + if (!pCost) return E_POINTER; + + *pCost = NLM_CONNECTION_COST_UNRESTRICTED; + return S_OK; +} + +static HRESULT WINAPI cost_manager_GetDataPlanStatus( + INetworkCostManager *iface, NLM_DATAPLAN_STATUS *pDataPlanStatus, + NLM_SOCKADDR *pDestIPAddr) +{ + FIXME( "%p, %p, %p\n", iface, pDataPlanStatus, pDestIPAddr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI cost_manager_SetDestinationAddresses( + INetworkCostManager *iface, UINT32 length, NLM_SOCKADDR *pDestIPAddrList, + VARIANT_BOOL bAppend) +{ + FIXME( "%p, %u, %p, %x\n", iface, length, pDestIPAddrList, bAppend ); + return E_NOTIMPL; +} + +static const INetworkCostManagerVtbl cost_manager_vtbl = +{ + cost_manager_QueryInterface, + cost_manager_AddRef, + cost_manager_Release, + cost_manager_GetCost, + cost_manager_GetDataPlanStatus, + cost_manager_SetDestinationAddresses +}; + static inline struct list_manager *impl_from_INetworkListManager( INetworkListManager *iface ) { @@ -76,6 +143,10 @@ static HRESULT WINAPI list_manager_QueryInterface( { *obj = iface; } + else if (IsEqualGUID( riid, &IID_INetworkCostManager )) + { + *obj = &mgr->INetworkCostManager_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -222,6 +293,7 @@ HRESULT list_manager_create( void **obj ) if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; + mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->refs = 1; *obj = &mgr->INetworkListManager_iface; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 9ac427e..453856f 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -27,6 +27,7 @@ static void test_INetworkListManager( void ) { INetworkListManager *mgr; + INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; VARIANT_BOOL connected; HRESULT hr; @@ -55,6 +56,23 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); + INetworkListManager_QueryInterface( mgr, &IID_INetworkCostManager, (void **)&cost_mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr == S_OK) + { + DWORD cost; + + hr = INetworkCostManager_GetCost( cost_mgr, NULL, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + cost = 0xdeadbeef; + hr = INetworkCostManager_GetCost( cost_mgr, &cost, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cost != 0xdeadbeef, "cost not set\n" ); + + INetworkCostManager_Release( cost_mgr ); + } + INetworkListManager_Release( mgr ); } diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index 6adca14..5be6e28 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -27,6 +27,7 @@ interface IEnumNetworks; interface IEnumNetworkConnections; interface INetwork; interface INetworkConnection; +interface INetworkCostManager; interface INetworkListManager; typedef [v1_enum] enum NLM_CONNECTIVITY @@ -49,6 +50,62 @@ typedef [v1_enum] enum NLM_ENUM_NETWORK NLM_ENUM_NETWORK_ALL = 0x03 } NLM_ENUM_NETWORK; +typedef [v1_enum] enum NLM_CONNECTION_COST +{ + NLM_CONNECTION_COST_UNKNOWN = 0x0, + NLM_CONNECTION_COST_UNRESTRICTED = 0x1, + NLM_CONNECTION_COST_FIXED = 0x2, + NLM_CONNECTION_COST_VARIABLE = 0x4, + NLM_CONNECTION_COST_OVERDATALIMIT = 0x10000, + NLM_CONNECTION_COST_CONGESTED = 0x20000, + NLM_CONNECTION_COST_ROAMING = 0x40000, + NLM_CONNECTION_COST_APPROACHINGDATALIMIT = 0x80000 +} NLM_CONNECTION_COST; + +typedef struct NLM_SOCKADDR +{ + BYTE data[128]; +} NLM_SOCKADDR; + +typedef struct NLM_USAGE_DATA +{ + DWORD UsageInMegabytes; + FILETIME LastSyncTime; +} NLM_USAGE_DATA; + +typedef struct NLM_DATAPLAN_STATUS +{ + GUID InterfaceGuid; + NLM_USAGE_DATA UsageData; + DWORD DataLimitInMegabytes; + DWORD InboundBandwidthInKbps; + DWORD OutboundBandwidthInKbps; + FILETIME NextBillingCycle; + DWORD MaxTransferSizeInMegabytes; + DWORD Reserved; +} NLM_DATAPLAN_STATUS; + +[ + object, + pointer_default(unique), + uuid(dcb00008-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkCostManager : IUnknown +{ + HRESULT GetCost( + [out] DWORD *pCost, + [in, unique] NLM_SOCKADDR *pDestIPAddr); + + HRESULT GetDataPlanStatus( + [out] NLM_DATAPLAN_STATUS *pDataPlanStatus, + [in, unique] NLM_SOCKADDR *pDestIPAddr); + + HRESULT SetDestinationAddresses( + [in] UINT32 length, + [in, unique, size_is(length)] NLM_SOCKADDR *pDestIPAddrList, + [in] VARIANT_BOOL bAppend); +} + [ dual, object,

1 0

Austin English : ntdll: Make sure flags are preserved in raise_trap_exception().
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 1a988fa46580250bd7640f8f0f3c4c06ea5053c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a988fa46580250bd7640f8f0… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Apr 12 13:20:55 2014 -0700 ntdll: Make sure flags are preserved in raise_trap_exception(). --- dlls/ntdll/signal_i386.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 63bf088..5f8b8fd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1868,9 +1868,10 @@ static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context if( !(context->EFlags & 0x100) || (ntdll_get_thread_data()->dr7 & 0xff) ) { /* (possible) hardware breakpoint, fetch the debug registers */ + DWORD saved_flags = context->ContextFlags; context->ContextFlags = CONTEXT_DEBUG_REGISTERS; NtGetContextThread(GetCurrentThread(), context); - context->ContextFlags |= CONTEXT_FULL; /* restore flags */ + context->ContextFlags |= saved_flags; /* restore flags */ } context->EFlags &= ~0x100; /* clear single-step flag */

1 0

Piotr Caban : user32/tests: Fix DrawMenuBar test failures.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 179957d5a909fd0a47f360970d0d9e5ee7cde3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179957d5a909fd0a47f360970… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 15 15:01:10 2014 +0200 user32/tests: Fix DrawMenuBar test failures. --- dlls/user32/tests/msg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a209492..684347d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4559,6 +4559,7 @@ static void test_messages(void) HMENU hmenu; MSG msg; LRESULT res; + POINT pos; flush_sequence(); @@ -4819,6 +4820,9 @@ static void test_messages(void) after_end_dialog = FALSE; test_def_id = FALSE; + ok(GetCursorPos(&pos), "GetCursorPos failed\n"); + ok(SetCursorPos(109, 109), "SetCursorPos failed\n"); + hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_POPUP|WS_CHILD, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL); ok(hwnd != 0, "Failed to create custom dialog window\n"); @@ -4832,6 +4836,7 @@ static void test_messages(void) ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); + ok(SetCursorPos(pos.x, pos.y), "SetCursorPos failed\n"); DestroyWindow(hwnd); flush_sequence();

1 0

Nikolay Sivov : shlwapi: Use a proper deallocator (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 0cb52a9cfa25a5ed2ee989e55bda58b442fefcc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb52a9cfa25a5ed2ee989e55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 01:52:49 2014 +0400 shlwapi: Use a proper deallocator (Coverity). --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 1a4ad14..b4b5b8a 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2821,7 +2821,7 @@ HRESULT WINAPI SHLoadIndirectString(LPCWSTR src, LPWSTR dst, UINT dst_len, void TRACE("returning %s\n", debugstr_w(dst)); end: if(hmod) FreeLibrary(hmod); - HeapFree(GetProcessHeap(), 0, dllname); + LocalFree(dllname); return hr; }

1 0

Nikolay Sivov : shell32: Use a proper deallocator (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 3cadbbb4b0016ea7d00b0f44337c5ea8ecd1043b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cadbbb4b0016ea7d00b0f443… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 01:53:05 2014 +0400 shell32: Use a proper deallocator (Coverity). --- dlls/shell32/trash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index a5d53a1..043ae5b 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -562,7 +562,7 @@ static HDPA enum_bucket_trashinfos(const TRASH_BUCKET *bucket, int *count) goto failed; if (DPA_InsertPtr(ret, DPA_APPEND, filename) == -1) { - SHFree(filename); + LocalFree(filename); goto failed; } (*count)++;

1 0

Nikolay Sivov : kernel32/tests: Added missing comma (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 00ff2ed81e13d289641b1ba2c2ac7d2067877287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ff2ed81e13d289641b1ba2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 02:00:05 2014 +0400 kernel32/tests: Added missing comma (Coverity). --- dlls/kernel32/tests/toolhelp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index af67688..ed76c9c 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -204,17 +204,19 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) static const char* curr_expected_modules[] = { - "kernel32_test.exe" + "kernel32_test.exe", "kernel32.dll", - "ntdll.dll", + "ntdll.dll" }; + static const char* sub_expected_modules[] = { "kernel32_test.exe", "kernel32.dll", "shell32.dll", - "ntdll.dll", + "ntdll.dll" }; + #define NUM_OF(x) (sizeof(x) / sizeof(x[0])) static void test_module(DWORD pid, const char* expected[], unsigned num_expected)

1 0

Dmitry Timoshkov : kernel32: Handle memory allocation failure in ReadConsoleA.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 2451d263de91bbde461a64d8627c7159bb4dc3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2451d263de91bbde461a64d86… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 15 11:20:21 2014 +0900 kernel32: Handle memory allocation failure in ReadConsoleA. --- dlls/kernel32/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 67c353b..9d47bf4 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1607,6 +1607,12 @@ BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfC DWORD ncr = 0; BOOL ret; + if (!ptr) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if ((ret = ReadConsoleW(hConsoleInput, ptr, nNumberOfCharsToRead, &ncr, NULL))) ncr = WideCharToMultiByte(GetConsoleCP(), 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL);

1 0

Bruno Jesus : ws2_32: Use the correct address family in gethostbyaddr.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: c33e7308ad8a6ff29c103fb31289931ba59cf75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c33e7308ad8a6ff29c103fb31… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 15 00:43:53 2014 -0300 ws2_32: Use the correct address family in gethostbyaddr. --- dlls/ws2_32/socket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe85356..54e7e2f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5084,6 +5084,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) { struct WS_hostent *retval = NULL; struct hostent* host; + int unixtype = convert_af_w2u(type); #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 char *extrabuf; @@ -5093,7 +5094,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) host = NULL; extrabuf=HeapAlloc(GetProcessHeap(),0,ebufsize) ; while(extrabuf) { - int res = gethostbyaddr_r(addr, len, type, + int res = gethostbyaddr_r(addr, len, unixtype, &hostentry, extrabuf, ebufsize, &host, &locerr); if( res != ERANGE) break; ebufsize *=2; @@ -5102,7 +5103,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) if (!host) SetLastError((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); #else EnterCriticalSection( &csWSgetXXXbyYYY ); - host = gethostbyaddr(addr, len, type); + host = gethostbyaddr(addr, len, unixtype); if (!host) SetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); #endif if( host != NULL ) retval = WS_dup_he(host); @@ -6408,7 +6409,7 @@ static struct WS_hostent *WS_dup_he(const struct hostent* p_he) p_to = WS_create_he(p_he->h_name, i + 1, alias_size, addresses + 1, p_he->h_length); if (!p_to) return NULL; - p_to->h_addrtype = p_he->h_addrtype; + p_to->h_addrtype = convert_af_u2w(p_he->h_addrtype); p_to->h_length = p_he->h_length; for(i = 0, p = p_to->h_addr_list[0]; p_he->h_addr_list[i]; i++, p += p_to->h_length)

1 0

Henri Verbeet : ddraw/tests: Try to make test_coop_level_mode_set() more reliable.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 1af267f613a365be418778f273afb88624bbfe0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af267f613a365be418778f27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 14 09:59:29 2014 +0200 ddraw/tests: Try to make test_coop_level_mode_set() more reliable. It appears that particularly on slower setups, on occasion we don't receive WM_DISPLAYCHANGE messages after a mode change. The theory is that the SendMessageTimeoutW() call in X11DRV_resize_desktop() ends up hitting the is_queue_hung() check in the send_message handler in the server, and the PeekMessage() calls should avoid that. --- dlls/ddraw/tests/ddraw1.c | 7 +++++++ dlls/ddraw/tests/ddraw2.c | 9 +++++++++ dlls/ddraw/tests/ddraw4.c | 9 +++++++++ dlls/ddraw/tests/ddraw7.c | 9 +++++++++ 4 files changed, 34 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1af267f613a365be41877…

1 0

Dmitry Timoshkov : include/xmldomdid.h: Synchronize with msxml2did.h.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 3bf372f2f5c5ef01b333faa422677c1aa711e774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf372f2f5c5ef01b333faa42… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 14 17:34:10 2014 +0900 include/xmldomdid.h: Synchronize with msxml2did.h. --- include/xmldomdid.h | 353 ++++++++++++++++++++++++++------------------------- 1 file changed, 183 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bf372f2f5c5ef01b333f…

1 0