wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Mariusz Pluciński : gameux/tests: Add test of IGameExplorer2 creation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 2464733ef3c0d55a0ef45a051bf570089361973b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2464733ef3c0d55a0ef45a051… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Aug 16 09:59:45 2010 +0200 gameux/tests: Add test of IGameExplorer2 creation. --- dlls/gameux/tests/gameexplorer.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index b87fd02..8498fe1 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -1,5 +1,5 @@ /* - * IGameExplorer tests + * IGameExplorer and IGameExplorer2 tests * * Copyright (C) 2010 Mariusz Pluciński * @@ -36,6 +36,7 @@ static void test_create( void ) HRESULT hr; IGameExplorer* ge = NULL; + IGameExplorer2* ge2 = NULL; /* interface available up from Vista */ hr = CoCreateInstance( &CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer, (LPVOID*)&ge); @@ -46,6 +47,16 @@ static void test_create( void ) } else win_skip("IGameExplorer cannot be created\n"); + + /* interface available up from Win7 */ + hr = CoCreateInstance( &CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer2, (LPVOID*)&ge2); + if(ge2) + { + ok( hr == S_OK, "IGameExplorer2 creating failed (result false)\n"); + IGameExplorer2_Release(ge2); + } + else + win_skip("IGameExplorer2 cannot be created\n"); } START_TEST(gameexplorer)

1 0

Mariusz Pluciński : gameux: Add IGameExplorer2 implementation stub.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 5aed3941ee1dc436b4d66e27239e50b8d6ff8234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aed3941ee1dc436b4d66e272… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Aug 16 09:58:50 2010 +0200 gameux: Add IGameExplorer2 implementation stub. --- dlls/gameux/gameexplorer.c | 87 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 0fa5e9c..dcb2d67 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -31,12 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); /* - * IGameExplorer implementation + * GameExplorer implementation */ typedef struct _GameExplorerImpl { const struct IGameExplorerVtbl *lpGameExplorerVtbl; + const struct IGameExplorer2Vtbl *lpGameExplorer2Vtbl; LONG ref; } GameExplorerImpl; @@ -45,6 +46,21 @@ static inline GameExplorerImpl *impl_from_IGameExplorer(IGameExplorer *iface) return (GameExplorerImpl*)((char*)iface - FIELD_OFFSET(GameExplorerImpl, lpGameExplorerVtbl)); } +static inline IGameExplorer* IGameExplorer_from_impl(GameExplorerImpl* This) +{ + return (struct IGameExplorer*)&This->lpGameExplorerVtbl; +} + +static inline GameExplorerImpl *impl_from_IGameExplorer2(IGameExplorer2 *iface) +{ + return (GameExplorerImpl*)((char*)iface - FIELD_OFFSET(GameExplorerImpl, lpGameExplorer2Vtbl)); +} + +static inline IGameExplorer2* IGameExplorer2_from_impl(GameExplorerImpl* This) +{ + return (struct IGameExplorer2*)&This->lpGameExplorer2Vtbl; +} + static HRESULT WINAPI GameExplorerImpl_QueryInterface( IGameExplorer *iface, REFIID riid, @@ -59,7 +75,11 @@ static HRESULT WINAPI GameExplorerImpl_QueryInterface( if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IGameExplorer)) { - *ppvObject = iface; + *ppvObject = IGameExplorer_from_impl(This); + } + else if(IsEqualGUID(riid, &IID_IGameExplorer2)) + { + *ppvObject = IGameExplorer2_from_impl(This); } else { @@ -158,6 +178,68 @@ static const struct IGameExplorerVtbl GameExplorerImplVtbl = GameExplorerImpl_VerifyAccess }; + +static HRESULT WINAPI GameExplorer2Impl_QueryInterface( + IGameExplorer2 *iface, + REFIID riid, + void **ppvObject) +{ + GameExplorerImpl *This = impl_from_IGameExplorer2(iface); + return GameExplorerImpl_QueryInterface(IGameExplorer_from_impl(This), riid, ppvObject); +} + +static ULONG WINAPI GameExplorer2Impl_AddRef(IGameExplorer2 *iface) +{ + GameExplorerImpl *This = impl_from_IGameExplorer2(iface); + return GameExplorerImpl_AddRef(IGameExplorer_from_impl(This)); +} + +static ULONG WINAPI GameExplorer2Impl_Release(IGameExplorer2 *iface) +{ + GameExplorerImpl *This = impl_from_IGameExplorer2(iface); + return GameExplorerImpl_Release(IGameExplorer_from_impl(This)); +} + +static HRESULT WINAPI GameExplorer2Impl_CheckAccess( + IGameExplorer2 *iface, + LPCWSTR binaryGDFPath, + BOOL *pHasAccess) +{ + GameExplorerImpl *This = impl_from_IGameExplorer2(iface); + FIXME("stub (%p, %s, %p)\n", This, debugstr_w(binaryGDFPath), pHasAccess); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameExplorer2Impl_InstallGame( + IGameExplorer2 *iface, + LPCWSTR binaryGDFPath, + LPCWSTR installDirectory, + GAME_INSTALL_SCOPE installScope) +{ + GameExplorerImpl *This = impl_from_IGameExplorer2(iface); + FIXME("stub (%p, %s, %s, 0x%x)\n", This, debugstr_w(binaryGDFPath), debugstr_w(installDirectory), installScope); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameExplorer2Impl_UninstallGame( + IGameExplorer2 *iface, + LPCWSTR binaryGDFPath) +{ + GameExplorerImpl *This = impl_from_IGameExplorer2(iface); + FIXME("stub (%p, %s)\n", This, debugstr_w(binaryGDFPath)); + return E_NOTIMPL; +} + +static const struct IGameExplorer2Vtbl GameExplorer2ImplVtbl = +{ + GameExplorer2Impl_QueryInterface, + GameExplorer2Impl_AddRef, + GameExplorer2Impl_Release, + GameExplorer2Impl_InstallGame, + GameExplorer2Impl_UninstallGame, + GameExplorer2Impl_CheckAccess +}; + /* * Construction routine */ @@ -175,6 +257,7 @@ HRESULT GameExplorer_create( return E_OUTOFMEMORY; pGameExplorer->lpGameExplorerVtbl = &GameExplorerImplVtbl; + pGameExplorer->lpGameExplorer2Vtbl = &GameExplorer2ImplVtbl; pGameExplorer->ref = 1; *ppObj = (IUnknown*)(&pGameExplorer->lpGameExplorerVtbl);

1 0

Mariusz Pluciński : gameux/tests: Add test of IGameStatisticsMgr creation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 152fbc1c3f7ab8e44ed002681f3e3ebe466df9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152fbc1c3f7ab8e44ed002681… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Aug 16 09:57:34 2010 +0200 gameux/tests: Add test of IGameStatisticsMgr creation. --- dlls/gameux/tests/Makefile.in | 3 +- dlls/gameux/tests/gamestatistics.c | 53 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in index b8e27d7..7188e74 100644 --- a/dlls/gameux/tests/Makefile.in +++ b/dlls/gameux/tests/Makefile.in @@ -6,7 +6,8 @@ TESTDLL = gameux.dll IMPORTS = ole32 C_SRCS = \ - gameexplorer.c + gameexplorer.c \ + gamestatistics.c @MAKE_TEST_RULES@ diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c new file mode 100644 index 0000000..3a8260c --- /dev/null +++ b/dlls/gameux/tests/gamestatistics.c @@ -0,0 +1,53 @@ +/* + * IGameStatisticsMgr tests + * + * Copyright (C) 2010 Mariusz Pluciński + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "gameux.h" +#include "wine/test.h" + +static void test_create( void ) +{ + HRESULT hr; + + IGameStatisticsMgr* gsm = NULL; + + /* interface available up from Win7 */ + hr = CoCreateInstance( &CLSID_GameStatistics, NULL, CLSCTX_INPROC_SERVER, &IID_IGameStatisticsMgr, (LPVOID*)&gsm); + if(gsm) + { + ok( hr == S_OK, "IGameStatisticsMgr creating failed (result: 0x%08x)\n", hr); + IGameStatisticsMgr_Release(gsm); + } + else + win_skip("IGameStatisticsMgr cannot be created\n"); +} + +START_TEST(gamestatistics) +{ + HRESULT hr; + + hr = CoInitialize( NULL ); + ok( hr == S_OK, "failed to init COM\n"); + + test_create(); + + CoUninitialize(); +}

1 0

Mariusz Pluciński : gameux: Add stub of IGameStatisticsMgr implementation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: fe65b83a9c03d61ae3782fb68814b70182d20928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe65b83a9c03d61ae3782fb68… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Aug 16 09:56:32 2010 +0200 gameux: Add stub of IGameStatisticsMgr implementation. --- dlls/gameux/Makefile.in | 1 + dlls/gameux/factory.c | 5 ++ dlls/gameux/gamestatistics.c | 151 ++++++++++++++++++++++++++++++++++++++++++ dlls/gameux/gameux_private.h | 1 + dlls/gameux/regsvr.c | 9 +++ 5 files changed, 167 insertions(+), 0 deletions(-) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index 8b65e62..59a170c 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -9,6 +9,7 @@ IMPORTS = uuid ole32 user32 advapi32 C_SRCS = \ factory.c \ gameexplorer.c \ + gamestatistics.c \ main.c \ regsvr.c diff --git a/dlls/gameux/factory.c b/dlls/gameux/factory.c index da1eee0..38be7a5 100644 --- a/dlls/gameux/factory.c +++ b/dlls/gameux/factory.c @@ -131,6 +131,7 @@ static const struct IClassFactoryVtbl gameuxcf_vtbl = }; static gameuxcf gameexplorercf = { &gameuxcf_vtbl, GameExplorer_create }; +static gameuxcf gamestatisticscf = { &gameuxcf_vtbl, GameStatistics_create }; /*************************************************************** * gameux ClassFactory @@ -148,6 +149,10 @@ HRESULT WINAPI DllGetClassObject( { cf = (IClassFactory*)&gameexplorercf.lpVtbl; } + else if( IsEqualCLSID( rclsid, &CLSID_GameStatistics )) + { + cf = (IClassFactory*) &gamestatisticscf.lpVtbl; + } if(!cf) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c new file mode 100644 index 0000000..098754e --- /dev/null +++ b/dlls/gameux/gamestatistics.c @@ -0,0 +1,151 @@ +/* + * Gameux library coclass GameStatistics implementation + * + * Copyright (C) 2010 Mariusz Pluciński + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS + +#include "config.h" + +#include "ole2.h" + +#include "gameux.h" +#include "gameux_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gameux); + +/* + * IGameStatisticsMgr implementation + */ + +typedef struct _GameStatisticsMgrImpl +{ + const struct IGameStatisticsMgrVtbl *lpVtbl; + LONG ref; +} GameStatisticsMgrImpl; + +static inline GameStatisticsMgrImpl *impl_from_IGameStatisticsMgr( IGameStatisticsMgr *iface ) +{ + return (GameStatisticsMgrImpl *)((char*)iface - FIELD_OFFSET(GameStatisticsMgrImpl, lpVtbl)); +} + + +static HRESULT WINAPI GameStatisticsMgrImpl_QueryInterface( + IGameStatisticsMgr *iface, + REFIID riid, + void **ppvObject) +{ + GameStatisticsMgrImpl *This = impl_from_IGameStatisticsMgr( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + *ppvObject = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IGameStatisticsMgr) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IGameStatisticsMgr_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI GameStatisticsMgrImpl_AddRef(IGameStatisticsMgr *iface) +{ + GameStatisticsMgrImpl *This = impl_from_IGameStatisticsMgr( iface ); + LONG ref; + + ref = InterlockedIncrement(&This->ref); + + TRACE("(%p): ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI GameStatisticsMgrImpl_Release(IGameStatisticsMgr *iface) +{ + GameStatisticsMgrImpl *This = impl_from_IGameStatisticsMgr( iface ); + LONG ref; + + ref = InterlockedDecrement(&This->ref); + TRACE("(%p): ref=%d\n", This, ref); + + if ( ref == 0 ) + { + TRACE("freeing GameStatistics object\n"); + HeapFree( GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( + IGameStatisticsMgr* iface, + LPCWSTR GDFBinaryPath, + GAMESTATS_OPEN_TYPE openType, + GAMESTATS_OPEN_RESULT *pOpenResult, + IGameStatistics **ppiStats) +{ + FIXME("stub (%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_RemoveGameStatistics( + IGameStatisticsMgr* iface, + LPCWSTR GDFBinaryPath) +{ + FIXME("stub (%p, %s)\n", iface, debugstr_w(GDFBinaryPath)); + return E_NOTIMPL; +} + +static const struct IGameStatisticsMgrVtbl GameStatisticsMgrImplVtbl = +{ + GameStatisticsMgrImpl_QueryInterface, + GameStatisticsMgrImpl_AddRef, + GameStatisticsMgrImpl_Release, + GameStatisticsMgrImpl_GetGameStatistics, + GameStatisticsMgrImpl_RemoveGameStatistics, +}; + +HRESULT GameStatistics_create( + IUnknown *pUnkOuter, + IUnknown **ppObj) +{ + GameStatisticsMgrImpl *pGameStatistics; + + TRACE("(%p, %p)\n", pUnkOuter, ppObj); + + pGameStatistics = HeapAlloc( GetProcessHeap(), 0, sizeof (*pGameStatistics) ); + + if( !pGameStatistics ) + return E_OUTOFMEMORY; + + pGameStatistics->lpVtbl = &GameStatisticsMgrImplVtbl; + pGameStatistics->ref = 1; + + *ppObj = (IUnknown*)(&pGameStatistics->lpVtbl); + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h index 3872cb9..bce3bf8 100644 --- a/dlls/gameux/gameux_private.h +++ b/dlls/gameux/gameux_private.h @@ -19,3 +19,4 @@ */ extern HRESULT GameExplorer_create(IUnknown* pUnkOuter, IUnknown **ppObj); +extern HRESULT GameStatistics_create(IUnknown* pUnkOuter, IUnknown **ppObj); diff --git a/dlls/gameux/regsvr.c b/dlls/gameux/regsvr.c index 50f7462..965cc12 100644 --- a/dlls/gameux/regsvr.c +++ b/dlls/gameux/regsvr.c @@ -464,6 +464,15 @@ static struct regsvr_coclass const coclass_list[] = { "gameux.GameExplorer.1", "1.0", }, + { + &CLSID_GameStatistics, + "GameStatistics Class", + NULL, + "gameux.dll", + "Apartment", + "gameux.GameStatistics.1", + "1,0", + }, { NULL } /* list terminator */ };

1 0

Luca Bennati : jscript: Update Italian translation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: ef36c1fb5ed6f534c27f55c96937ac48350e5a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef36c1fb5ed6f534c27f55c96… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Aug 17 12:56:34 2010 +0200 jscript: Update Italian translation. --- dlls/jscript/jscript_It.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_It.rc b/dlls/jscript/jscript_It.rc index 3bfea63..4534303 100644 --- a/dlls/jscript/jscript_It.rc +++ b/dlls/jscript/jscript_It.rc @@ -30,6 +30,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Chiamata o argomento di procedura non valido" IDS_CREATE_OBJ_ERROR "Il server di automazione non può creare l'oggetto" IDS_NO_PROPERTY "L'oggetto non supporta questa proprietà o metodo" + IDS_UNSUPPORTED_ACTION "L'oggetto non supporta questa azione" IDS_ARG_NOT_OPT "Argomento non opzionale" IDS_SYNTAX_ERROR "Errore di sintassi" IDS_SEMICOLON "Richiesto ';'"

1 0

Andrew Nguyen : ipconfig: Partially implement full adapter information output.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: ca0fc0acd4e9fcede2ff114f90fb0435b73de58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0fc0acd4e9fcede2ff114f9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Aug 16 21:28:11 2010 -0500 ipconfig: Partially implement full adapter information output. --- programs/ipconfig/En.rc | 10 +++ programs/ipconfig/ipconfig.c | 137 +++++++++++++++++++++++++++++++++++++++++- programs/ipconfig/ipconfig.h | 10 +++ 3 files changed, 156 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/En.rc b/programs/ipconfig/En.rc index 7eeffdf..73f112c 100644 --- a/programs/ipconfig/En.rc +++ b/programs/ipconfig/En.rc @@ -32,4 +32,14 @@ STRINGTABLE STRING_UNKNOWN, "Unknown" STRING_CONN_DNS_SUFFIX, "Connection-specific DNS suffix" STRING_IP_ADDRESS, "IP address" + STRING_HOSTNAME, "Hostname" + STRING_NODE_TYPE, "Node type" + STRING_BROADCAST, "Broadcast" + STRING_PEER_TO_PEER, "Peer-to-peer" + STRING_MIXED, "Mixed" + STRING_HYBRID, "Hybrid" + STRING_IP_ROUTING, "IP routing enabled" + STRING_DESCRIPTION, "Description" + STRING_PHYS_ADDR, "Physical address" + STRING_DHCP_ENABLED, "DHCP enabled" } diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 89ea8a4..ccaa78c 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -179,6 +179,141 @@ static void print_basic_information(void) } } +static const WCHAR *nodetype_to_string(DWORD type) +{ + static WCHAR msg_buffer[50]; + + int msg; + + switch (type) + { + case BROADCAST_NODETYPE: + msg = STRING_BROADCAST; + break; + case PEER_TO_PEER_NODETYPE: + msg = STRING_PEER_TO_PEER; + break; + case MIXED_NODETYPE: + msg = STRING_MIXED; + break; + case HYBRID_NODETYPE: + msg = STRING_HYBRID; + break; + default: + msg = STRING_UNKNOWN; + } + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + + return msg_buffer; +} + +static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len) +{ + static const WCHAR fmtW[] = {'%','0','2','X','-',0}; + static const WCHAR fmt2W[] = {'%','0','2','X',0}; + + if (!len) + *buf = '\0'; + else + { + WCHAR *p = buf; + DWORD i; + + for (i = 0; i < len - 1; i++) + { + sprintfW(p, fmtW, addr[i]); + p += 3; + } + sprintfW(p, fmt2W, addr[i]); + } + + return buf; +} + +static void print_full_information(void) +{ + static const WCHAR yesW[] = {'Y','e','s',0}; + static const WCHAR noW[] = {'N','o',0}; + static const WCHAR newlineW[] = {'\n',0}; + + FIXED_INFO *info; + IP_ADAPTER_ADDRESSES *adapters; + ULONG out = 0; + + if (GetNetworkParams(NULL, &out) == ERROR_BUFFER_OVERFLOW) + { + info = HeapAlloc(GetProcessHeap(), 0, out); + if (!info) + exit(1); + + if (GetNetworkParams(info, &out) == ERROR_SUCCESS) + { + WCHAR hostnameW[MAX_HOSTNAME_LEN + 4]; + + MultiByteToWideChar(CP_ACP, 0, info->HostName, -1, hostnameW, sizeof(hostnameW)); + print_field(STRING_HOSTNAME, hostnameW); + + /* FIXME: Output primary DNS suffix. */ + + print_field(STRING_NODE_TYPE, nodetype_to_string(info->NodeType)); + print_field(STRING_IP_ROUTING, info->EnableRouting ? yesW : noW); + + /* FIXME: Output WINS proxy status and DNS suffix search list. */ + + ipconfig_printfW(newlineW); + } + + HeapFree(GetProcessHeap(), 0, info); + } + + if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) + { + adapters = HeapAlloc(GetProcessHeap(), 0, out); + if (!adapters) + exit(1); + + if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &out) == ERROR_SUCCESS) + { + IP_ADAPTER_ADDRESSES *p; + + for (p = adapters; p; p = p->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *addr; + WCHAR physaddr_buf[3 * MAX_ADAPTER_ADDRESS_LENGTH]; + + ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); + ipconfig_printfW(newlineW); + print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); + print_field(STRING_DESCRIPTION, p->Description); + print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); + print_field(STRING_DHCP_ENABLED, (p->Flags & IP_ADAPTER_DHCP_ENABLED) ? yesW : noW); + + /* FIXME: Output autoconfiguration status. */ + + for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) + { + WCHAR addr_buf[54]; + DWORD len = sizeof(addr_buf)/sizeof(WCHAR); + + if (WSAAddressToStringW(addr->Address.lpSockaddr, + addr->Address.iSockaddrLength, NULL, + addr_buf, &len) == 0) + print_field(STRING_IP_ADDRESS, addr_buf); + /* FIXME: Output corresponding subnet mask. */ + } + + /* FIXME: Output default gateway address. */ + + ipconfig_printfW(newlineW); + } + } + + HeapFree(GetProcessHeap(), 0, adapters); + } +} + int wmain(int argc, WCHAR *argv[]) { static const WCHAR slashHelp[] = {'/','?',0}; @@ -207,7 +342,7 @@ int wmain(int argc, WCHAR *argv[]) return 1; } - WINE_FIXME("/all option is not currently handled\n"); + print_full_information(); } else { diff --git a/programs/ipconfig/ipconfig.h b/programs/ipconfig/ipconfig.h index e555b87..4f9325b 100644 --- a/programs/ipconfig/ipconfig.h +++ b/programs/ipconfig/ipconfig.h @@ -28,3 +28,13 @@ #define STRING_UNKNOWN 105 #define STRING_CONN_DNS_SUFFIX 106 #define STRING_IP_ADDRESS 107 +#define STRING_HOSTNAME 108 +#define STRING_NODE_TYPE 109 +#define STRING_BROADCAST 110 +#define STRING_PEER_TO_PEER 111 +#define STRING_MIXED 112 +#define STRING_HYBRID 113 +#define STRING_IP_ROUTING 114 +#define STRING_DESCRIPTION 115 +#define STRING_PHYS_ADDR 116 +#define STRING_DHCP_ENABLED 117

1 0

Andrew Nguyen : include: Add definitions for IP_ADAPTER_ADDRESSES flag values.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: eb69648cf5329452fbea0b51b34bd1fc1e2fe043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb69648cf5329452fbea0b51b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Aug 16 02:54:37 2010 -0500 include: Add definitions for IP_ADAPTER_ADDRESSES flag values. --- include/iptypes.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 37a4b9e..9b80f77 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -189,6 +189,17 @@ typedef struct _IP_ADAPTER_PREFIX { ULONG PrefixLength; } IP_ADAPTER_PREFIX, *PIP_ADAPTER_PREFIX; +#define IP_ADAPTER_DDNS_ENABLED 0x1 +#define IP_ADAPTER_REGISTER_ADAPTER_SUFFIX 0x2 +#define IP_ADAPTER_DHCP_ENABLED 0x4 +#define IP_ADAPTER_RECEIVE_ONLY 0x8 +#define IP_ADAPTER_NO_MULTICAST 0x10 +#define IP_ADAPTER_IPV6_OTHER_STATEFUL_CONFIG 0x20 +#define IP_ADAPTER_NETBIOS_OVER_TCPIP_ENABLED 0x40 +#define IP_ADAPTER_IPV4_ENABLED 0x80 +#define IP_ADAPTER_IPV6_ENABLED 0x100 +#define IP_ADAPTER_IPV6_MANAGE_ADDRESS_CONFIG 0x200 + typedef struct _IP_ADAPTER_ADDRESSES { union { ULONGLONG Alignment;

1 0

Andrew Nguyen : ipconfig: Partially implement basic adapter information output.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 6ffd8d49be532d62b8e7d0ab2564e78939661fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffd8d49be532d62b8e7d0ab2… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Aug 16 21:27:32 2010 -0500 ipconfig: Partially implement basic adapter information output. --- programs/ipconfig/En.rc | 5 ++ programs/ipconfig/Makefile.in | 2 +- programs/ipconfig/ipconfig.c | 130 +++++++++++++++++++++++++++++++++++++++-- programs/ipconfig/ipconfig.h | 5 ++ 4 files changed, 136 insertions(+), 6 deletions(-) diff --git a/programs/ipconfig/En.rc b/programs/ipconfig/En.rc index 4635ff6..7eeffdf 100644 --- a/programs/ipconfig/En.rc +++ b/programs/ipconfig/En.rc @@ -27,4 +27,9 @@ STRINGTABLE { STRING_USAGE, "Usage: ipconfig [ /? | /all ]\n" STRING_INVALID_CMDLINE, "Error: Unknown or invalid command line parameters specified\n" + STRING_ADAPTER_FRIENDLY, "%s adapter %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Unknown" + STRING_CONN_DNS_SUFFIX, "Connection-specific DNS suffix" + STRING_IP_ADDRESS, "IP address" } diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 18a7714..cd0c2dc 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ipconfig.exe APPMODE = -mconsole -municode -IMPORTS = user32 +IMPORTS = iphlpapi ws2_32 user32 C_SRCS = ipconfig.c diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 7c988bb..89ea8a4 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -20,6 +20,7 @@ */ #include <windows.h> +#include <iphlpapi.h> #include <wine/debug.h> #include <wine/unicode.h> @@ -27,16 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ipconfig); -static int ipconfig_printfW(const WCHAR *msg, ...) +static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) { - va_list va_args; int wlen; DWORD count, ret; WCHAR msg_buffer[8192]; - va_start(va_args, msg); wlen = vsprintfW(msg_buffer, msg, va_args); - va_end(va_args); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); if (!ret) @@ -59,6 +57,34 @@ static int ipconfig_printfW(const WCHAR *msg, ...) return count; } +static int ipconfig_printfW(const WCHAR *msg, ...) +{ + va_list va_args; + int len; + + va_start(va_args, msg); + len = ipconfig_vprintfW(msg, va_args); + va_end(va_args); + + return len; +} + +static int ipconfig_message_printfW(int msg, ...) +{ + va_list va_args; + WCHAR msg_buffer[8192]; + int len; + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + + va_start(va_args, msg); + len = ipconfig_vprintfW(msg_buffer, va_args); + va_end(va_args); + + return len; +} + static int ipconfig_message(int msg) { static const WCHAR formatW[] = {'%','s',0}; @@ -66,19 +92,109 @@ static int ipconfig_message(int msg) LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR)); + return ipconfig_printfW(formatW, msg_buffer); } +static const WCHAR *iftype_to_string(DWORD type) +{ + static WCHAR msg_buffer[50]; + + int msg; + + switch (type) + { + case IF_TYPE_ETHERNET_CSMACD: + /* The loopback adapter appears as an Ethernet device. */ + case IF_TYPE_SOFTWARE_LOOPBACK: + msg = STRING_ETHERNET; + break; + default: + msg = STRING_UNKNOWN; + } + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + + return msg_buffer; +} + +static void print_field(int msg, const WCHAR *value) +{ + static const WCHAR formatW[] = {' ',' ',' ',' ','%','s',':',' ','%','s','\n',0}; + + WCHAR field[] = {'.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.', + ' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ',0}; + WCHAR name_buffer[sizeof(field)/sizeof(WCHAR)]; + + LoadStringW(GetModuleHandleW(NULL), msg, name_buffer, sizeof(name_buffer)/sizeof(WCHAR)); + memcpy(field, name_buffer, sizeof(WCHAR) * min(strlenW(name_buffer), sizeof(field)/sizeof(WCHAR) - 1)); + + ipconfig_printfW(formatW, field, value); +} + +static void print_basic_information(void) +{ + IP_ADAPTER_ADDRESSES *adapters; + ULONG out = 0; + + if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) + { + adapters = HeapAlloc(GetProcessHeap(), 0, out); + if (!adapters) + exit(1); + + if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &out) == ERROR_SUCCESS) + { + IP_ADAPTER_ADDRESSES *p; + + for (p = adapters; p; p = p->Next) + { + static const WCHAR newlineW[] = {'\n',0}; + + IP_ADAPTER_UNICAST_ADDRESS *addr; + + ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); + ipconfig_printfW(newlineW); + print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); + + for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) + { + WCHAR addr_buf[54]; + DWORD len = sizeof(addr_buf)/sizeof(WCHAR); + + if (WSAAddressToStringW(addr->Address.lpSockaddr, + addr->Address.iSockaddrLength, NULL, + addr_buf, &len) == 0) + print_field(STRING_IP_ADDRESS, addr_buf); + /* FIXME: Output corresponding subnet mask. */ + } + + /* FIXME: Output default gateway address. */ + ipconfig_printfW(newlineW); + } + } + + HeapFree(GetProcessHeap(), 0, adapters); + } +} + int wmain(int argc, WCHAR *argv[]) { static const WCHAR slashHelp[] = {'/','?',0}; static const WCHAR slashAll[] = {'/','a','l','l',0}; + WSADATA data; + + if (WSAStartup(MAKEWORD(2, 2), &data)) + return 1; + if (argc > 1) { if (!strcmpW(slashHelp, argv[1])) { ipconfig_message(STRING_USAGE); + WSACleanup(); return 1; } else if (!strcmpiW(slashAll, argv[1])) @@ -87,6 +203,7 @@ int wmain(int argc, WCHAR *argv[]) { ipconfig_message(STRING_INVALID_CMDLINE); ipconfig_message(STRING_USAGE); + WSACleanup(); return 1; } @@ -96,10 +213,13 @@ int wmain(int argc, WCHAR *argv[]) { ipconfig_message(STRING_INVALID_CMDLINE); ipconfig_message(STRING_USAGE); + WSACleanup(); return 1; } } + else + print_basic_information(); - WINE_FIXME("Network interface output is not currently implemented\n"); + WSACleanup(); return 0; } diff --git a/programs/ipconfig/ipconfig.h b/programs/ipconfig/ipconfig.h index f02792d..e555b87 100644 --- a/programs/ipconfig/ipconfig.h +++ b/programs/ipconfig/ipconfig.h @@ -23,3 +23,8 @@ /* Translation IDs. */ #define STRING_USAGE 101 #define STRING_INVALID_CMDLINE 102 +#define STRING_ADAPTER_FRIENDLY 103 +#define STRING_ETHERNET 104 +#define STRING_UNKNOWN 105 +#define STRING_CONN_DNS_SUFFIX 106 +#define STRING_IP_ADDRESS 107

1 0

Andrew Nguyen : include: Add prototype for GetAdaptersAddresses.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 2e0a7e7f4ae678cb2eaa503193adf18af3e5820f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0a7e7f4ae678cb2eaa50319… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Aug 16 02:54:18 2010 -0500 include: Add prototype for GetAdaptersAddresses. --- include/iphlpapi.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 1e64a18..b73363d 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -141,6 +141,11 @@ DWORD WINAPI EnableRouter(HANDLE* pHandle, OVERLAPPED* pOverlapped); DWORD WINAPI UnenableRouter(OVERLAPPED* pOverlapped, LPDWORD lpdwEnableCount); +#ifdef _WINSOCK2API_ +ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, + PIP_ADAPTER_ADDRESSES aa, PULONG buflen); +#endif + #ifdef __cplusplus } #endif

1 0

Andrew Nguyen : ipconfig: Implement basic command-line parsing.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: de239dc852c8df5914abe974eac202d60b83611d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de239dc852c8df5914abe974e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Aug 16 02:54:10 2010 -0500 ipconfig: Implement basic command-line parsing. --- programs/ipconfig/En.rc | 30 ++++++++++++++++ programs/ipconfig/Makefile.in | 3 ++ programs/ipconfig/ipconfig.c | 76 ++++++++++++++++++++++++++++++++++++++++- programs/ipconfig/ipconfig.h | 25 +++++++++++++ 4 files changed, 133 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/En.rc b/programs/ipconfig/En.rc new file mode 100644 index 0000000..4635ff6 --- /dev/null +++ b/programs/ipconfig/En.rc @@ -0,0 +1,30 @@ +/* + * IP configuration utility + * English language support + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ipconfig.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Usage: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Error: Unknown or invalid command line parameters specified\n" +} diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 0cd8ce6..18a7714 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -5,7 +5,10 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ipconfig.exe APPMODE = -mconsole -municode +IMPORTS = user32 C_SRCS = ipconfig.c +RC_SRCS = En.rc + @MAKE_PROG_RULES@ diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index fc5d95c..7c988bb 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -1,6 +1,7 @@ /* * IP configuration utility * + * Copyright 2008 Andrew Riedi * Copyright 2010 Andrew Nguyen * * This library is free software; you can redistribute it and/or @@ -22,10 +23,83 @@ #include <wine/debug.h> #include <wine/unicode.h> +#include "ipconfig.h" + WINE_DEFAULT_DEBUG_CHANNEL(ipconfig); +static int ipconfig_printfW(const WCHAR *msg, ...) +{ + va_list va_args; + int wlen; + DWORD count, ret; + WCHAR msg_buffer[8192]; + + va_start(va_args, msg); + wlen = vsprintfW(msg_buffer, msg, va_args); + va_end(va_args); + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, + NULL, 0, NULL, NULL); + msgA = HeapAlloc(GetProcessHeap(), 0, len); + if (!msgA) + return 0; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, + NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, msgA); + } + + return count; +} + +static int ipconfig_message(int msg) +{ + static const WCHAR formatW[] = {'%','s',0}; + WCHAR msg_buffer[8192]; + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + return ipconfig_printfW(formatW, msg_buffer); +} + int wmain(int argc, WCHAR *argv[]) { - WINE_FIXME("ipconfig.exe is not implemented\n"); + static const WCHAR slashHelp[] = {'/','?',0}; + static const WCHAR slashAll[] = {'/','a','l','l',0}; + + if (argc > 1) + { + if (!strcmpW(slashHelp, argv[1])) + { + ipconfig_message(STRING_USAGE); + return 1; + } + else if (!strcmpiW(slashAll, argv[1])) + { + if (argv[2]) + { + ipconfig_message(STRING_INVALID_CMDLINE); + ipconfig_message(STRING_USAGE); + return 1; + } + + WINE_FIXME("/all option is not currently handled\n"); + } + else + { + ipconfig_message(STRING_INVALID_CMDLINE); + ipconfig_message(STRING_USAGE); + return 1; + } + } + + WINE_FIXME("Network interface output is not currently implemented\n"); return 0; } diff --git a/programs/ipconfig/ipconfig.h b/programs/ipconfig/ipconfig.h new file mode 100644 index 0000000..f02792d --- /dev/null +++ b/programs/ipconfig/ipconfig.h @@ -0,0 +1,25 @@ +/* + * IP configuration utility private definitions + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +/* Translation IDs. */ +#define STRING_USAGE 101 +#define STRING_INVALID_CMDLINE 102

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
89
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 2010