wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Andrew Eikum : xaudio2: Fix return value for RegisterForCallbacks.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: 997843700a1ce6a2b9f616687ee697357abe4749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997843700a1ce6a2b9f616687… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 27 09:30:55 2015 -0500 xaudio2: Fix return value for RegisterForCallbacks. --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 5aa34b5..94b42eb 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1297,7 +1297,7 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, LeaveCriticalSection(&This->lock); - return E_NOTIMPL; + return S_OK; } static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface,

1 0

Dmitry Timoshkov : winhttp/tests: Add a test for IWinHttpRequest::Invoke.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: f46868fe30d5646fb71c0be5c4a3a9ec10ec7ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46868fe30d5646fb71c0be5c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 27 18:28:32 2015 +0800 winhttp/tests: Add a test for IWinHttpRequest::Invoke. --- dlls/winhttp/tests/winhttp.c | 71 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9bda2af..c3a3f11 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -26,11 +26,14 @@ #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> -#include "initguid.h" +#include <initguid.h> #include <httprequest.h> +#include <httprequestid.h> #include "wine/test.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; @@ -3539,6 +3542,71 @@ static void test_IWinHttpRequest(void) CoUninitialize(); } +static void test_IWinHttpRequest_Invoke(void) +{ + static const WCHAR utf8W[] = {'U','T','F','-','8',0}; + static const WCHAR regid[] = {'W','i','n','H','t','t','p','.','W','i','n','H','t','t','p','R','e','q','u','e','s','t','.','5','.','1',0}; + WCHAR openW[] = {'O','p','e','n',0}; + WCHAR optionW[] = {'O','p','t','i','o','n',0}; + OLECHAR *open = openW, *option = optionW; + BSTR utf8; + CLSID clsid; + IWinHttpRequest *request; + IDispatch *dispatch; + DISPID id; + DISPPARAMS params; + VARIANT arg[3], ret; + UINT err; + BOOL bret; + HRESULT hr; + + CoInitialize(NULL); + + hr = CLSIDFromProgID(regid, &clsid); + ok(hr == S_OK, "CLSIDFromProgID error %#x\n", hr); + bret = IsEqualIID(&clsid, &CLSID_WinHttpRequest); + ok(bret || broken(!bret) /* win2003 */, "not expected %s\n", wine_dbgstr_guid(&clsid)); + + hr = CoCreateInstance(&CLSID_WinHttpRequest, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&request); + ok(hr == S_OK, "error %#x\n", hr); + + hr = IWinHttpRequest_QueryInterface(request, &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "error %#x\n", hr); + IDispatch_Release(dispatch); + + hr = IWinHttpRequest_GetIDsOfNames(request, &IID_NULL, &open, 1, 0x0409, &id); + ok(hr == S_OK, "error %#x\n", hr); + ok(id == DISPID_HTTPREQUEST_OPEN, "expected DISPID_HTTPREQUEST_OPEN, got %u\n", id); + + hr = IWinHttpRequest_GetIDsOfNames(request, &IID_NULL, &option, 1, 0x0409, &id); + ok(hr == S_OK, "error %#x\n", hr); + ok(id == DISPID_HTTPREQUEST_OPTION, "expected DISPID_HTTPREQUEST_OPTION, got %u\n", id); + + memset(&params, 0, sizeof(params)); + params.cArgs = 2; + params.cNamedArgs = 0; + params.rgvarg = arg; + V_VT(&arg[0]) = VT_BSTR; + utf8 = SysAllocString(utf8W); + V_BSTR(&arg[0]) = utf8; + V_VT(&arg[1]) = VT_R8; + V_R8(&arg[1]) = 2.0; + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + SysFreeString(utf8); + IWinHttpRequest_Release(request); + + CoUninitialize(); +} + static void test_WinHttpDetectAutoProxyConfigUrl(void) { BOOL ret; @@ -3839,6 +3907,7 @@ START_TEST (winhttp) test_resolve_timeout(); test_credentials(); test_IWinHttpRequest(); + test_IWinHttpRequest_Invoke(); test_WinHttpDetectAutoProxyConfigUrl(); test_WinHttpGetIEProxyConfigForCurrentUser(); test_WinHttpGetProxyForUrl();

1 0

Piotr Caban : imm32: Don' t use functions that use graphics driver in THREAD_DETACH/PROCESS_DETACH.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: 60b996ad4b46be7c50784d4a0382060845893b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b996ad4b46be7c50784d4a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 27 16:16:09 2015 +0200 imm32: Don't use functions that use graphics driver in THREAD_DETACH/PROCESS_DETACH. --- dlls/imm32/imm.c | 1 - dlls/imm32/tests/imm32.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3629024..3fab6fc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -270,7 +270,6 @@ static void IMM_FreeThreadData(void) list_remove(&data->entry); LeaveCriticalSection(&threaddata_cs); IMM_DestroyContext(data->defaultContext); - DestroyWindow(data->hwndDefault); HeapFree(GetProcessHeap(),0,data); TRACE("Thread Data Destroyed\n"); return; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 870f5d2..b1f3913 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -782,10 +782,29 @@ static void test_ImmGetDescription(void) UnloadKeyboardLayout(hkl); } +static LRESULT (WINAPI *old_imm_wnd_proc)(HWND, UINT, WPARAM, LPARAM); +static LRESULT WINAPI imm_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ok(msg != WM_DESTROY, "got WM_DESTROY message\n"); + return old_imm_wnd_proc(hwnd, msg, wparam, lparam); +} + +static HWND thread_ime_wnd; +static DWORD WINAPI test_ImmGetDefaultIMEWnd_thread(void *arg) +{ + CreateWindowA("static", "static", WS_POPUP, 0, 0, 1, 1, NULL, NULL, NULL, NULL); + + thread_ime_wnd = ImmGetDefaultIMEWnd(0); + ok(thread_ime_wnd != 0, "ImmGetDefaultIMEWnd returned NULL\n"); + old_imm_wnd_proc = (void*)SetWindowLongPtrW(thread_ime_wnd, GWLP_WNDPROC, (LONG_PTR)imm_wnd_proc); + return 0; +} + static void test_ImmDefaultHwnd(void) { HIMC imc1, imc2, imc3; HWND def1, def3; + HANDLE thread; HWND hwnd; hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", @@ -813,6 +832,11 @@ static void test_ImmDefaultHwnd(void) ok(imc1 == imc3, "IME context should not change\n"); ImmSetOpenStatus(imc2, FALSE); + thread = CreateThread(NULL, 0, test_ImmGetDefaultIMEWnd_thread, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + ok(thread_ime_wnd != def1, "thread_ime_wnd == def1\n"); + ok(!IsWindow(thread_ime_wnd), "thread_ime_wnd was not destroyed\n"); + ImmReleaseContext(hwnd, imc1); ImmReleaseContext(hwnd, imc3); ImmDestroyContext(imc2);

1 0

Daniel Lehman : kernel32/tests: Add tests for Invariant.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: 72922cd1eac5ece5a3c05f5361ba6e30c31dfc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72922cd1eac5ece5a3c05f536… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 26 00:06:07 2015 -0700 kernel32/tests: Add tests for Invariant. --- dlls/kernel32/tests/locale.c | 185 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c48a620..1e4fd2a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4317,6 +4317,190 @@ static void test_EnumSystemGeoID(void) } } +struct invariant_entry { + const char *name; + int id; + const char *expect; +}; + +#define X(x) #x, x +static const struct invariant_entry invariant_list[] = { + { X(LOCALE_ILANGUAGE), "007f" }, + { X(LOCALE_SENGLANGUAGE), "Invariant Language" }, + { X(LOCALE_SABBREVLANGNAME), "IVL" }, + { X(LOCALE_SNATIVELANGNAME), "Invariant Language" }, + { X(LOCALE_ICOUNTRY), "1" }, + { X(LOCALE_SENGCOUNTRY), "Invariant Country" }, + { X(LOCALE_SABBREVCTRYNAME), "IVC" }, + { X(LOCALE_SNATIVECTRYNAME), "Invariant Country" }, + { X(LOCALE_IDEFAULTLANGUAGE), "0409" }, + { X(LOCALE_IDEFAULTCOUNTRY), "1" }, + { X(LOCALE_IDEFAULTCODEPAGE), "437" }, + { X(LOCALE_IDEFAULTANSICODEPAGE), "1252" }, + { X(LOCALE_IDEFAULTMACCODEPAGE), "10000" }, + { X(LOCALE_SLIST), "," }, + { X(LOCALE_IMEASURE), "0" }, + { X(LOCALE_SDECIMAL), "." }, + { X(LOCALE_STHOUSAND), "," }, + { X(LOCALE_SGROUPING), "3;0" }, + { X(LOCALE_IDIGITS), "2" }, + { X(LOCALE_ILZERO), "1" }, + { X(LOCALE_INEGNUMBER), "1" }, + { X(LOCALE_SNATIVEDIGITS), "0123456789" }, + { X(LOCALE_SCURRENCY), "\x00a4" }, + { X(LOCALE_SINTLSYMBOL), "XDR" }, + { X(LOCALE_SMONDECIMALSEP), "." }, + { X(LOCALE_SMONTHOUSANDSEP), "," }, + { X(LOCALE_SMONGROUPING), "3;0" }, + { X(LOCALE_ICURRDIGITS), "2" }, + { X(LOCALE_IINTLCURRDIGITS), "2" }, + { X(LOCALE_ICURRENCY), "0" }, + { X(LOCALE_INEGCURR), "0" }, + { X(LOCALE_SDATE), "/" }, + { X(LOCALE_STIME), ":" }, + { X(LOCALE_SSHORTDATE), "MM/dd/yyyy" }, + { X(LOCALE_SLONGDATE), "dddd, dd MMMM yyyy" }, + { X(LOCALE_STIMEFORMAT), "HH:mm:ss" }, + { X(LOCALE_IDATE), "0" }, + { X(LOCALE_ILDATE), "1" }, + { X(LOCALE_ITIME), "1" }, + { X(LOCALE_ITIMEMARKPOSN), "0" }, + { X(LOCALE_ICENTURY), "1" }, + { X(LOCALE_ITLZERO), "1" }, + { X(LOCALE_IDAYLZERO), "1" }, + { X(LOCALE_IMONLZERO), "1" }, + { X(LOCALE_S1159), "AM" }, + { X(LOCALE_S2359), "PM" }, + { X(LOCALE_ICALENDARTYPE), "1" }, + { X(LOCALE_IOPTIONALCALENDAR), "0" }, + { X(LOCALE_IFIRSTDAYOFWEEK), "6" }, + { X(LOCALE_IFIRSTWEEKOFYEAR), "0" }, + { X(LOCALE_SDAYNAME1), "Monday" }, + { X(LOCALE_SDAYNAME2), "Tuesday" }, + { X(LOCALE_SDAYNAME3), "Wednesday" }, + { X(LOCALE_SDAYNAME4), "Thursday" }, + { X(LOCALE_SDAYNAME5), "Friday" }, + { X(LOCALE_SDAYNAME6), "Saturday" }, + { X(LOCALE_SDAYNAME7), "Sunday" }, + { X(LOCALE_SABBREVDAYNAME1), "Mon" }, + { X(LOCALE_SABBREVDAYNAME2), "Tue" }, + { X(LOCALE_SABBREVDAYNAME3), "Wed" }, + { X(LOCALE_SABBREVDAYNAME4), "Thu" }, + { X(LOCALE_SABBREVDAYNAME5), "Fri" }, + { X(LOCALE_SABBREVDAYNAME6), "Sat" }, + { X(LOCALE_SABBREVDAYNAME7), "Sun" }, + { X(LOCALE_SMONTHNAME1), "January" }, + { X(LOCALE_SMONTHNAME2), "February" }, + { X(LOCALE_SMONTHNAME3), "March" }, + { X(LOCALE_SMONTHNAME4), "April" }, + { X(LOCALE_SMONTHNAME5), "May" }, + { X(LOCALE_SMONTHNAME6), "June" }, + { X(LOCALE_SMONTHNAME7), "July" }, + { X(LOCALE_SMONTHNAME8), "August" }, + { X(LOCALE_SMONTHNAME9), "September" }, + { X(LOCALE_SMONTHNAME10), "October" }, + { X(LOCALE_SMONTHNAME11), "November" }, + { X(LOCALE_SMONTHNAME12), "December" }, + { X(LOCALE_SMONTHNAME13), "" }, + { X(LOCALE_SABBREVMONTHNAME1), "Jan" }, + { X(LOCALE_SABBREVMONTHNAME2), "Feb" }, + { X(LOCALE_SABBREVMONTHNAME3), "Mar" }, + { X(LOCALE_SABBREVMONTHNAME4), "Apr" }, + { X(LOCALE_SABBREVMONTHNAME5), "May" }, + { X(LOCALE_SABBREVMONTHNAME6), "Jun" }, + { X(LOCALE_SABBREVMONTHNAME7), "Jul" }, + { X(LOCALE_SABBREVMONTHNAME8), "Aug" }, + { X(LOCALE_SABBREVMONTHNAME9), "Sep" }, + { X(LOCALE_SABBREVMONTHNAME10), "Oct" }, + { X(LOCALE_SABBREVMONTHNAME11), "Nov" }, + { X(LOCALE_SABBREVMONTHNAME12), "Dec" }, + { X(LOCALE_SABBREVMONTHNAME13), "" }, + { X(LOCALE_SPOSITIVESIGN), "+" }, + { X(LOCALE_SNEGATIVESIGN), "-" }, + { X(LOCALE_IPOSSIGNPOSN), "3" }, + { X(LOCALE_INEGSIGNPOSN), "0" }, + { X(LOCALE_IPOSSYMPRECEDES), "1" }, + { X(LOCALE_IPOSSEPBYSPACE), "0" }, + { X(LOCALE_INEGSYMPRECEDES), "1" }, + { X(LOCALE_INEGSEPBYSPACE), "0" }, + { X(LOCALE_SISO639LANGNAME), "iv" }, + { X(LOCALE_SISO3166CTRYNAME), "IV" }, + { X(LOCALE_IDEFAULTEBCDICCODEPAGE), "037" }, + { X(LOCALE_IPAPERSIZE), "9" }, + { X(LOCALE_SENGCURRNAME), "International Monetary Fund" }, + { X(LOCALE_SNATIVECURRNAME), "International Monetary Fund" }, + { X(LOCALE_SYEARMONTH), "yyyy MMMM" }, + { X(LOCALE_IDIGITSUBSTITUTION), "1" }, + { X(LOCALE_SNAME), "" }, + { X(LOCALE_SSCRIPTS), "Latn;" }, + { 0 } +}; +#undef X + +static void test_invariant(void) +{ + int ret; + int len; + char buffer[BUFFER_SIZE]; + const struct invariant_entry *ptr = invariant_list; + + if (!GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SLANGUAGE, buffer, sizeof(buffer))) + { + win_skip("GetLocaleInfoA(LOCALE_INVARIANT) not supported\n"); /* win2k */ + return; + } + + while (ptr->name) + { + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|ptr->id, buffer, sizeof(buffer)); + if (!ret && (ptr->id == LOCALE_SNAME || ptr->id == LOCALE_SSCRIPTS)) + win_skip("not supported\n"); /* winxp/win2k3 */ + else + { + len = strlen(ptr->expect)+1; /* include \0 */ + ok(ret == len, "For id %d, expected ret == %d, got %d, error %d\n", + ptr->id, len, ret, GetLastError()); + ok(!strcmp(buffer, ptr->expect), "For id %d, Expected %s, got '%s'\n", + ptr->id, ptr->expect, buffer); + } + + ptr++; + } + + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + { + /* some locales translate these */ + static const char lang[] = "Invariant Language (Invariant Country)"; + static const char cntry[] = "Invariant Country"; + static const char sortm[] = "Math Alphanumerics"; + static const char sortd[] = "Default"; /* win2k3 */ + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SLANGUAGE, buffer, sizeof(buffer)); + len = lstrlenA(lang) + 1; + ok(ret == len, "Expected ret == %d, got %d, error %d\n", len, ret, GetLastError()); + ok(!strcmp(buffer, lang), "Expected %s, got '%s'\n", lang, buffer); + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SCOUNTRY, buffer, sizeof(buffer)); + len = lstrlenA(cntry) + 1; + ok(ret == len, "Expected ret == %d, got %d, error %d\n", len, ret, GetLastError()); + ok(!strcmp(buffer, cntry), "Expected %s, got '%s'\n", cntry, buffer); + + ret = GetLocaleInfoA(LOCALE_INVARIANT, NUO|LOCALE_SSORTNAME, buffer, sizeof(buffer)); + if (ret == lstrlenA(sortm)+1) + ok(!strcmp(buffer, sortm), "Expected %s, got '%s'\n", sortm, buffer); + else if (ret == lstrlenA(sortd)+1) /* win2k3 */ + ok(!strcmp(buffer, sortd), "Expected %s, got '%s'\n", sortd, buffer); + else + ok(0, "Expected ret == %d or %d, got %d, error %d\n", + lstrlenA(sortm)+1, lstrlenA(sortd)+1, ret, GetLastError()); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -4356,6 +4540,7 @@ START_TEST(locale) test_CompareStringOrdinal(); test_GetGeoInfo(); test_EnumSystemGeoID(); + test_invariant(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Hans Leidekker : wininet: Don't trace the password in InternetConnectW.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: e5ce90ed1b88bba8389aabfcb9ad0b6f837f6a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ce90ed1b88bba8389aabfcb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:05:16 2015 +0200 wininet: Don't trace the password in InternetConnectW. --- dlls/wininet/internet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ee04f40..c64816e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1317,9 +1317,8 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, HINTERNET rc = NULL; DWORD res = ERROR_SUCCESS; - TRACE("(%p, %s, %i, %s, %s, %i, %x, %lx)\n", hInternet, debugstr_w(lpszServerName), - nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword), - dwService, dwFlags, dwContext); + TRACE("(%p, %s, %u, %s, %p, %u, %x, %lx)\n", hInternet, debugstr_w(lpszServerName), + nServerPort, debugstr_w(lpszUserName), lpszPassword, dwService, dwFlags, dwContext); if (!lpszServerName) {

1 0

Hans Leidekker : netprofm: Add a stub implementation of INetworkConnection.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 2d22baa6be75b05175c739e42807ab67fbb68bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d22baa6be75b05175c739e42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:04:51 2015 +0200 netprofm: Add a stub implementation of INetworkConnection. --- dlls/netprofm/list.c | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 273 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 6364515..b39856d 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -36,6 +36,7 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/list.h" #include "netprofm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(netprofm); @@ -50,12 +51,23 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } +struct connection +{ + INetworkConnection INetworkConnection_iface; + LONG refs; + struct list entry; + GUID id; + VARIANT_BOOL connected_to_internet; + VARIANT_BOOL connected; +}; + struct list_manager { INetworkListManager INetworkListManager_iface; INetworkCostManager INetworkCostManager_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG refs; + struct list connections; }; struct connection_point @@ -358,7 +370,16 @@ static ULONG WINAPI list_manager_Release( LONG refs = InterlockedDecrement( &mgr->refs ); if (!refs) { + struct list *ptr; + TRACE( "destroying %p\n", mgr ); + + while ((ptr = list_head( &mgr->connections ))) + { + struct connection *connection = LIST_ENTRY( ptr, struct connection, entry ); + list_remove( &connection->entry ); + INetworkConnection_Release( &connection->INetworkConnection_iface ); + } heap_free( mgr ); } return refs; @@ -583,6 +604,257 @@ static const struct IConnectionPointContainerVtbl cpc_vtbl = ConnectionPointContainer_FindConnectionPoint }; +static inline struct connection *impl_from_INetworkConnection( + INetworkConnection *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, INetworkConnection_iface ); +} + +static HRESULT WINAPI connection_QueryInterface( + INetworkConnection *iface, REFIID riid, void **obj ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); + + if (IsEqualIID( riid, &IID_INetworkConnection ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + WARN( "interface not supported %s\n", debugstr_guid(riid) ); + *obj = NULL; + return E_NOINTERFACE; + } + INetworkConnection_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI connection_AddRef( + INetworkConnection *iface ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p\n", connection ); + return InterlockedIncrement( &connection->refs ); +} + +static ULONG WINAPI connection_Release( + INetworkConnection *iface ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + LONG refs; + + TRACE( "%p\n", connection ); + + if (!(refs = InterlockedDecrement( &connection->refs ))) + { + list_remove( &connection->entry ); + heap_free( connection ); + } + return refs; +} + +static HRESULT WINAPI connection_GetTypeInfoCount( + INetworkConnection *iface, + UINT *count ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetTypeInfo( + INetworkConnection *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetIDsOfNames( + INetworkConnection *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Invoke( + INetworkConnection *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetNetwork( + INetworkConnection *iface, + INetwork **ppNetwork ) +{ + FIXME( "%p, %p\n", iface, ppNetwork ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_IsConnectedToInternet( + INetworkConnection *iface, + VARIANT_BOOL *pbIsConnected ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pbIsConnected ); + + *pbIsConnected = connection->connected_to_internet; + return S_OK; +} + +static HRESULT WINAPI connection_get_IsConnected( + INetworkConnection *iface, + VARIANT_BOOL *pbIsConnected ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pbIsConnected ); + + *pbIsConnected = connection->connected; + return S_OK; +} + +static HRESULT WINAPI connection_GetConnectivity( + INetworkConnection *iface, + NLM_CONNECTIVITY *pConnectivity ) +{ + FIXME( "%p, %p\n", iface, pConnectivity ); + + *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + return S_OK; +} + +static HRESULT WINAPI connection_GetConnectionId( + INetworkConnection *iface, + GUID *pgdConnectionId ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pgdConnectionId ); + + *pgdConnectionId = connection->id; + return S_OK; +} + +static HRESULT WINAPI connection_GetAdapterId( + INetworkConnection *iface, + GUID *pgdAdapterId ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + FIXME( "%p, %p\n", iface, pgdAdapterId ); + + *pgdAdapterId = connection->id; + return S_OK; +} + +static HRESULT WINAPI connection_GetDomainType( + INetworkConnection *iface, + NLM_DOMAIN_TYPE *pDomainType ) +{ + FIXME( "%p, %p\n", iface, pDomainType ); + + *pDomainType = NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK; + return S_OK; +} + +static const struct INetworkConnectionVtbl connection_vtbl = +{ + connection_QueryInterface, + connection_AddRef, + connection_Release, + connection_GetTypeInfoCount, + connection_GetTypeInfo, + connection_GetIDsOfNames, + connection_Invoke, + connection_GetNetwork, + connection_get_IsConnectedToInternet, + connection_get_IsConnected, + connection_GetConnectivity, + connection_GetConnectionId, + connection_GetAdapterId, + connection_GetDomainType +}; + +static struct connection *create_connection( const GUID *id ) +{ + struct connection *ret; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + + ret->INetworkConnection_iface.lpVtbl = &connection_vtbl; + ret->refs = 1; + ret->id = *id; + ret->connected = VARIANT_FALSE; + ret->connected_to_internet = VARIANT_FALSE; + list_init( &ret->entry ); + + return ret; +} + +static void init_networks( struct list_manager *mgr ) +{ + DWORD size = 0; + IP_ADAPTER_ADDRESSES *buf, *aa; + GUID id; + ULONG ret, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | + GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_ALL_GATEWAYS; + + list_init( &mgr->connections ); + + ret = GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return; + + if (!(buf = heap_alloc( size ))) return; + if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) return; + + memset( &id, 0, sizeof(id) ); + for (aa = buf; aa; aa = aa->Next) + { + struct connection *connection; + + id.Data1 = aa->IfIndex; + + if (!(connection = create_connection( &id ))) + goto done; + + if (aa->FirstUnicastAddress) + { + connection->connected = VARIANT_TRUE; + } + if (aa->FirstGatewayAddress) + { + connection->connected_to_internet = VARIANT_TRUE; + } + + list_add_tail( &mgr->connections, &connection->entry ); + } + +done: + heap_free( buf ); +} + HRESULT list_manager_create( void **obj ) { struct list_manager *mgr; @@ -593,6 +865,7 @@ HRESULT list_manager_create( void **obj ) mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl; + init_networks( mgr ); mgr->refs = 1; *obj = &mgr->INetworkListManager_iface;

1 0

Hans Leidekker : netprofm: Support IDispatch on the list manager object.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 0335459f5f3c74dfba56a45cea251cd3b2988c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0335459f5f3c74dfba56a45ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:04:28 2015 +0200 netprofm: Support IDispatch on the list manager object. --- dlls/netprofm/list.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index ee0f7b7..6364515 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -374,6 +374,7 @@ static HRESULT WINAPI list_manager_QueryInterface( TRACE( "%p, %s, %p\n", mgr, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID_INetworkListManager ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { *obj = iface;

1 0

Hans Leidekker : netprofm: Clear the object pointer on failure in QueryInterface.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 981460e84a5c82982a82971f3954f27393cdb126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981460e84a5c82982a82971f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:04:07 2015 +0200 netprofm: Clear the object pointer on failure in QueryInterface. --- dlls/netprofm/list.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index cd51d37..ee0f7b7 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -99,6 +99,7 @@ static HRESULT WINAPI connection_point_QueryInterface( else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + *obj = NULL; return E_NOINTERFACE; } IConnectionPoint_AddRef( iface ); @@ -388,6 +389,7 @@ static HRESULT WINAPI list_manager_QueryInterface( else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + *obj = NULL; return E_NOINTERFACE; } INetworkListManager_AddRef( iface );

1 0

Hans Leidekker : netprofm: Introduce heap allocation macros.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 346dd728fb1b2331a2f250d11e35ba6ecf802661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346dd728fb1b2331a2f250d11… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:03:48 2015 +0200 netprofm: Introduce heap allocation macros. --- dlls/netprofm/list.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 245f7f4..cd51d37 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -40,6 +40,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + struct list_manager { INetworkListManager INetworkListManager_iface; @@ -111,7 +121,7 @@ static ULONG WINAPI connection_point_Release( { TRACE( "destroying %p\n", cp ); IConnectionPointContainer_Release( cp->container ); - HeapFree( GetProcessHeap(), 0, cp ); + heap_free( cp ); } return refs; } @@ -199,7 +209,7 @@ static HRESULT connection_point_create( struct connection_point *cp; TRACE( "%p, %s, %p\n", obj, debugstr_guid(riid), container ); - if (!(cp = HeapAlloc( GetProcessHeap(), 0, sizeof(*cp) ))) return E_OUTOFMEMORY; + if (!(cp = heap_alloc( sizeof(*cp) ))) return E_OUTOFMEMORY; cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; cp->container = container; cp->refs = 1; @@ -348,7 +358,7 @@ static ULONG WINAPI list_manager_Release( if (!refs) { TRACE( "destroying %p\n", mgr ); - HeapFree( GetProcessHeap(), 0, mgr ); + heap_free( mgr ); } return refs; } @@ -576,7 +586,7 @@ HRESULT list_manager_create( void **obj ) TRACE( "%p\n", obj ); - if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; + if (!(mgr = heap_alloc( sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl;

1 0

Hans Leidekker : include: Add missing Network List Manager declarations.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 8e90ff68c7bbd26d73241d0719d64f0b8edb1299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e90ff68c7bbd26d73241d071… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:03:19 2015 +0200 include: Add missing Network List Manager declarations. --- include/netlistmgr.idl | 193 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index e6328f4..e098f72 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -44,6 +44,13 @@ typedef [v1_enum] enum NLM_CONNECTIVITY NLM_CONNECTIVITY_IPV6_INTERNET = 0x0400 } NLM_CONNECTIVITY; +typedef [v1_enum] enum NLM_DOMAIN_TYPE +{ + NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK = 0x00, + NLM_DOMAIN_TYPE_DOMAIN_NETWORK = 0x01, + NLM_DOMAIN_TYPE_DOMAIN_AUTHENTICATED = 0x02 +} NLM_DOMAIN_TYPE; + typedef [v1_enum] enum NLM_ENUM_NETWORK { NLM_ENUM_NETWORK_CONNECTED = 0x01, @@ -112,6 +119,20 @@ interface INetworkCostManager : IUnknown [ object, pointer_default(unique), + uuid(dcb0000a-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkConnectionCost : IUnknown +{ + HRESULT GetCost( + [out] DWORD *pCost); + + HRESULT GetDataPlanStatus( + [out] NLM_DATAPLAN_STATUS *pDataPlanStatus); +} + +[ + object, + pointer_default(unique), uuid(dcb00009-570f-4a9b-8d69-199fdba5723b) ] interface INetworkCostManagerEvents : IUnknown @@ -125,6 +146,68 @@ interface INetworkCostManagerEvents : IUnknown } [ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00003-570f-4a9b-8d69-199fdba5723b) +] +interface IEnumNetworks : IDispatch +{ + [id(DISPID_NEWENUM), propget, hidden, restricted] + HRESULT _NewEnum( + [out, retval] IEnumVARIANT **ppEnumVar); + + [id(1)] + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] INetwork **rgelt, + [in, out] ULONG *pceltFetched); + + [id(2)] + HRESULT Skip( + [in] ULONG celt); + + [id(3)] + HRESULT Reset(); + + [id(4)] + HRESULT Clone( + [out, retval] IEnumNetworks **ppEnumNetwork); +} + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00006-570f-4a9b-8d69-199fdba5723b) +] +interface IEnumNetworkConnections : IDispatch +{ + [id(DISPID_NEWENUM), propget, hidden, restricted] + HRESULT _NewEnum( + [out, retval] IEnumVARIANT **ppEnumVar); + + [id(1)] + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] INetworkConnection **rgelt, + [in, out] ULONG *pceltFetched); + + [id(2)] + HRESULT Skip( + [in] ULONG celt); + + [id(3)] + HRESULT Reset(); + + [id(4)] + HRESULT Clone( + [out, retval] IEnumNetworkConnections **ppEnumNetwork); +} + +[ dual, object, oleautomation, @@ -197,3 +280,113 @@ interface INetworkConnectionEvents : IUnknown [in] GUID connectionId, [in] NLM_CONNECTION_PROPERTY_CHANGE flags); } + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00005-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkConnection : IDispatch +{ + [id(1)] + HRESULT GetNetwork( + [out, retval] INetwork **ppNetwork); + + [propget, id(2)] + HRESULT IsConnectedToInternet( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [propget, id(3)] + HRESULT IsConnected( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [id(4)] + HRESULT GetConnectivity( + [out, retval] NLM_CONNECTIVITY *pConnectivity); + + [id(5)] + HRESULT GetConnectionId( + [out, retval] GUID *pgdConnectionId); + + [id(6)] + HRESULT GetAdapterId( + [out, retval] GUID *pgdAdapterId); + + [id(7)] + HRESULT GetDomainType( + [out, retval] NLM_DOMAIN_TYPE *pDomainType); +} + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00002-570f-4a9b-8d69-199fdba5723b) +] +interface INetwork : IDispatch +{ + typedef enum NLM_NETWORK_CATEGORY + { + NLM_NETWORK_CATEGORY_PUBLIC = 0x00, + NLM_NETWORK_CATEGORY_PRIVATE = 0x01, + NLM_NETWORK_CATEGORY_DOMAIN_AUTHENTICATED = 0x02 + } NLM_NETWORK_CATEGORY; + + [id(1)] + HRESULT GetName( + [out, string, retval] BSTR *pszNetworkName); + + [id(2)] + HRESULT SetName( + [in, string] BSTR szNetworkNewName); + + [id(3)] + HRESULT GetDescription( + [out, string, retval] BSTR *pszDescription); + + [id(4)] + HRESULT SetDescription( + [in, string] BSTR szDescription); + + [id(5)] + HRESULT GetNetworkId( + [out, retval] GUID *pgdGuidNetworkId); + + [id(6)] + HRESULT GetDomainType( + [out, retval] NLM_DOMAIN_TYPE *pNetworkType); + + [id(7)] + HRESULT GetNetworkConnections( + [out, retval] IEnumNetworkConnections **ppEnumNetworkConnection); + + [id(8)] + HRESULT GetTimeCreatedAndConnected( + [out] DWORD *pdwLowDateTimeCreated, + [out] DWORD *pdwHighDateTimeCreated, + [out] DWORD *pdwLowDateTimeConnected, + [out] DWORD *pdwHighDateTimeConnected); + + [propget, id(9)] + HRESULT IsConnectedToInternet( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [propget, id(10)] + HRESULT IsConnected( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [id(11)] + HRESULT GetConnectivity( + [out, retval] NLM_CONNECTIVITY *pConnectivity); + + [id(12)] + HRESULT GetCategory( + [out, retval] NLM_NETWORK_CATEGORY *pCategory); + + [id(13)] + HRESULT SetCategory( + [in] NLM_NETWORK_CATEGORY NewCategory); +}

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
51
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 August 2015