September 2010 - Wine-commits

Tijl Coosemans : configure: Detect resolver functionality on FreeBSD.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: e7ec164563d5657d3cfede16476496c31708bfea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ec164563d5657d3cfede164… Author: Tijl Coosemans <tijl(a)coosemans.org> Date: Thu Sep 23 18:20:31 2010 +0200 configure: Detect resolver functionality on FreeBSD. On FreeBSD this is part of libc. --- configure | 17 +++++++++++------ configure.ac | 15 ++++++++++----- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 788a57a..4937577 100755 --- a/configure +++ b/configure @@ -9977,13 +9977,13 @@ esac fi -RESOLVLIBS="" - if test "$ac_cv_header_resolv_h" = "yes" then ac_save_LIBS="$LIBS" - LIBS="$LIBS -lresolv" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + for lib in '' -lresolv + do + LIBS="$lib $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -9992,7 +9992,7 @@ then int main () { -res_init(); +res_query("foo",ns_c_in,0,0,0); ; return 0; } @@ -10001,10 +10001,15 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_RESOLV 1" >>confdefs.h - RESOLVLIBS="-lresolv" + RESOLVLIBS="$lib" + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + if test "${RESOLVLIBS+set}" = set; then + break + fi + done LIBS="$ac_save_LIBS" fi diff --git a/configure.ac b/configure.ac index f279293..341ba18 100644 --- a/configure.ac +++ b/configure.ac @@ -1266,17 +1266,22 @@ WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"], dnl **** Check for resolver library *** -AC_SUBST(RESOLVLIBS,"") if test "$ac_cv_header_resolv_h" = "yes" then ac_save_LIBS="$LIBS" - LIBS="$LIBS -lresolv" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H + for lib in '' -lresolv + do + LIBS="$lib $ac_save_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include <resolv.h>]],[[res_init();]])], +#include <resolv.h>]],[[res_query("foo",ns_c_in,0,0,0);]])], [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) - RESOLVLIBS="-lresolv"]) + AC_SUBST(RESOLVLIBS,"$lib")]) + if test "${RESOLVLIBS+set}" = set; then + break + fi + done LIBS="$ac_save_LIBS" fi

1 0

Mariusz Pluciński : gameux/tests: Add test of storing and reading game statistics.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 7c798a4a7d849baf44fa8ee5d2a6cc44762b58db URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c798a4a7d849baf44fa8ee5d… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 23 15:36:57 2010 +0200 gameux/tests: Add test of storing and reading game statistics. --- dlls/gameux/tests/gamestatistics.c | 314 ++++++++++++++++++++++++++++++++++-- 1 files changed, 302 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c798a4a7d849baf44fa8…

1 0

Mariusz Pluciński : gameux: Add partial implementation of IGameStatisticsMgr::GetGameStatistics.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 23efe79289a019fec68708425e66baf3baee84ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=23efe79289a019fec68708425… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 23 15:37:42 2010 +0200 gameux: Add partial implementation of IGameStatisticsMgr::GetGameStatistics. --- dlls/gameux/gameexplorer.c | 39 +++---------------------------- dlls/gameux/gamestatistics.c | 52 ++++++++++++++++++++++++++++++++++++++++- dlls/gameux/gameux_private.h | 49 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 37 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1816ebd..744ae8a 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -69,29 +69,9 @@ void GAMEUX_uninitGameData(struct GAMEUX_GAME_DATA *GameData) /******************************************************************************* * GAMEUX_buildGameRegistryPath * - * Helper function, builds registry path to key, where game's data are stored - * - * Parameters: - * installScope [I] the scope which was used in AddGame/InstallGame call - * gameInstanceId [I] game instance GUID. If NULL, then only - * path to scope will be returned - * lpRegistryPath [O] pointer which will receive address to string - * containing expected registry path. Path - * is relative to HKLM registry key. It - * must be freed by calling HeapFree(GetProcessHeap(), 0, ...) - * - * Name of game's registry key always follows patterns below: - * When game is installed for current user only (installScope is GIS_CURRENT_USER): - * HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\ - * GameUX\[user's security ID]\[game instance ID] - * - * When game is installed for all users (installScope is GIS_ALL_USERS): - * HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\ - * GameUX\Games\[game instance ID] - * - * + * Internal helper function. Description available in gameux_private.h file */ -static HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, +HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, LPCGUID gameInstanceId, LPWSTR* lpRegistryPath) { @@ -697,20 +677,9 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { /******************************************************************************* * GAMEUX_FindGameInstanceId * - * Helper funtion. Searches for instance identifier of given game in given - * installation scope. - * - * Parameters: - * sGDFBinaryPath [I] path to binary containing GDF - * installScope [I] game install scope to search in - * pInstanceId [O] instance identifier of given game - * - * Returns: - * S_OK id was returned properly - * S_FALSE id was not found in the registry - * E_OUTOFMEMORY problem while memory allocation + * Internal helper function. Description available in gameux_private.h file */ -static HRESULT GAMEUX_FindGameInstanceId( +HRESULT GAMEUX_FindGameInstanceId( LPCWSTR sGDFBinaryPath, GAME_INSTALL_SCOPE installScope, GUID* pInstanceId) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 098754e..0b872ac 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -22,6 +22,7 @@ #include "config.h" #include "ole2.h" +#include "winreg.h" #include "gameux.h" #include "gameux_private.h" @@ -107,8 +108,55 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( 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 const WCHAR sApplicationId[] = + {'A','p','p','l','i','c','a','t','i','o','n','I','d',0}; + + HRESULT hr; + GUID instanceId; + LPWSTR lpRegistryPath = NULL; + WCHAR lpApplicationId[49]; + DWORD dwLength = sizeof(lpApplicationId); + GAME_INSTALL_SCOPE installScope; + + TRACE("(%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats); + + if(!GDFBinaryPath) + return E_INVALIDARG; + + installScope = GIS_CURRENT_USER; + hr = GAMEUX_FindGameInstanceId(GDFBinaryPath, installScope, &instanceId); + + if(hr == S_FALSE) + { + installScope = GIS_ALL_USERS; + hr = GAMEUX_FindGameInstanceId(GDFBinaryPath, installScope, &instanceId); + } + + if(hr == S_FALSE) + /* game not registered, so statistics cannot be used */ + hr = E_FAIL; + + if(SUCCEEDED(hr)) + /* game is registered, let's read it's application id from registry */ + hr = GAMEUX_buildGameRegistryPath(installScope, &instanceId, &lpRegistryPath); + + if(SUCCEEDED(hr)) + { + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, + lpRegistryPath, sApplicationId, RRF_RT_REG_SZ, + NULL, lpApplicationId, &dwLength)); + } + + if(SUCCEEDED(hr)) + { + TRACE("found app id: %s\n", debugstr_w(lpApplicationId)); + FIXME("creating instance of IGameStatistics not yet implemented\n"); + hr = E_NOTIMPL; + } + + HeapFree(GetProcessHeap(), 0, lpRegistryPath); + + return hr; } static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_RemoveGameStatistics( diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h index 97826f0..86532e2 100644 --- a/dlls/gameux/gameux_private.h +++ b/dlls/gameux/gameux_private.h @@ -86,3 +86,52 @@ HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, LPCWSTR sGameInstallDirectory, GAME_INSTALL_SCOPE installScope, GUID *pInstanceID); +/******************************************************************************* + * GAMEUX_FindGameInstanceId + * + * Helper funtion. Searches for instance identifier of given game in given + * installation scope. Implemented in gameexplorer.c + * + * Parameters: + * sGDFBinaryPath [I] path to binary containing GDF + * installScope [I] game install scope to search in + * pInstanceId [O] instance identifier of given game + * + * Returns: + * S_OK id was returned properly + * S_FALSE id was not found in the registry + * E_OUTOFMEMORY problem while memory allocation + */ +HRESULT GAMEUX_FindGameInstanceId( + LPCWSTR sGDFBinaryPath, + GAME_INSTALL_SCOPE installScope, + GUID* pInstanceId); +/******************************************************************************* + * GAMEUX_buildGameRegistryPath + * + * Helper function, builds registry path to key, where game's data are stored. + * Implemented in gameexplorer.c + * + * Parameters: + * installScope [I] the scope which was used in AddGame/InstallGame call + * gameInstanceId [I] game instance GUID. If NULL, then only + * path to scope will be returned + * lpRegistryPath [O] pointer which will receive address to string + * containing expected registry path. Path + * is relative to HKLM registry key. It + * must be freed by calling HeapFree(GetProcessHeap(), 0, ...) + * + * Name of game's registry key always follows patterns below: + * When game is installed for current user only (installScope is GIS_CURRENT_USER): + * HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\ + * GameUX\[user's security ID]\[game instance ID] + * + * When game is installed for all users (installScope is GIS_ALL_USERS): + * HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\ + * GameUX\Games\[game instance ID] + * + * + */ +HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, + LPCGUID gameInstanceId, + LPWSTR* lpRegistryPath);

1 0

Mariusz Pluciński : gameux: Add stub of IGameStatistics interface implementation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 0ef59050c6c855907fc1a2b2f04fbe5ef2816e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef59050c6c855907fc1a2b2f… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 23 15:37:54 2010 +0200 gameux: Add stub of IGameStatistics interface implementation. --- dlls/gameux/gamestatistics.c | 224 +++++++++++++++++++++++++++++++++++- dlls/gameux/tests/gamestatistics.c | 2 +- 2 files changed, 222 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 0b872ac..6978173 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -31,10 +31,221 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); -/* - * IGameStatisticsMgr implementation +/******************************************************************************* + * IGameStatistics implementation */ +typedef struct _GameStatisticsImpl +{ + const struct IGameStatisticsVtbl *lpVtbl; + LONG ref; +} GameStatisticsImpl; + +static inline GameStatisticsImpl *impl_from_IGameStatistics( IGameStatistics *iface ) +{ + return (GameStatisticsImpl *)((char*)iface - FIELD_OFFSET(GameStatisticsImpl, lpVtbl)); +} +static inline IGameStatistics *IGameStatistics_from_impl( GameStatisticsImpl* This ) +{ + return (struct IGameStatistics*)&This->lpVtbl; +} + + +static HRESULT WINAPI GameStatisticsImpl_QueryInterface( + IGameStatistics *iface, + REFIID riid, + void **ppvObject) +{ + GameStatisticsImpl *This = impl_from_IGameStatistics( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + *ppvObject = NULL; + + if ( IsEqualGUID( riid, &IID_IUnknown ) || + IsEqualGUID( riid, &IID_IGameStatistics ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IGameStatistics_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI GameStatisticsImpl_AddRef(IGameStatistics *iface) +{ + GameStatisticsImpl *This = impl_from_IGameStatistics( iface ); + LONG ref; + + ref = InterlockedIncrement(&This->ref); + + TRACE("(%p): ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI GameStatisticsImpl_Release(IGameStatistics *iface) +{ + GameStatisticsImpl *This = impl_from_IGameStatistics( iface ); + LONG ref; + + ref = InterlockedDecrement( &This->ref ); + TRACE("(%p): ref=%d\n", This, ref); + + if ( ref == 0 ) + { + TRACE("freeing IGameStatistics\n"); + HeapFree( GetProcessHeap(), 0, This ); + } + + return ref; +} + +static HRESULT WINAPI GameStatisticsImpl_GetMaxCategoryLength( + IGameStatistics *iface, + UINT *cch) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_GetMaxNameLength( + IGameStatistics *iface, + UINT *cch) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} +static HRESULT WINAPI GameStatisticsImpl_GetMaxValueLength( + IGameStatistics *iface, + UINT *cch) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_GetMaxCategories( + IGameStatistics *iface, + WORD *pMax) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_GetMaxStatsPerCategory( + IGameStatistics *iface, + WORD *pMax) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_SetCategoryTitle( + IGameStatistics *iface, + WORD categoryIndex, + LPCWSTR title) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_GetCategoryTitle( + IGameStatistics *iface, + WORD categoryIndex, + LPWSTR *pTitle) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_GetStatistic( + IGameStatistics *iface, + WORD categoryIndex, + WORD statIndex, + LPWSTR *pName, + LPWSTR *pValue) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_SetStatistic( + IGameStatistics *iface, + WORD categoryIndex, + WORD statIndex, + LPCWSTR name, + LPCWSTR value) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_Save( + IGameStatistics *iface, + BOOL trackChanges) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_SetLastPlayedCategory( + IGameStatistics *iface, + UINT categoryIndex) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI GameStatisticsImpl_GetLastPlayedCategory( + IGameStatistics *iface, + UINT *pCategoryIndex) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static const struct IGameStatisticsVtbl GameStatisticsImplVtbl = +{ + GameStatisticsImpl_QueryInterface, + GameStatisticsImpl_AddRef, + GameStatisticsImpl_Release, + GameStatisticsImpl_GetMaxCategoryLength, + GameStatisticsImpl_GetMaxNameLength, + GameStatisticsImpl_GetMaxValueLength, + GameStatisticsImpl_GetMaxCategories, + GameStatisticsImpl_GetMaxStatsPerCategory, + GameStatisticsImpl_SetCategoryTitle, + GameStatisticsImpl_GetCategoryTitle, + GameStatisticsImpl_GetStatistic, + GameStatisticsImpl_SetStatistic, + GameStatisticsImpl_Save, + GameStatisticsImpl_SetLastPlayedCategory, + GameStatisticsImpl_GetLastPlayedCategory +}; + + +HRESULT create_IGameStatistics(GameStatisticsImpl** ppStats) +{ + TRACE("(%p)\n", ppStats); + + *ppStats = HeapAlloc( GetProcessHeap(), 0, sizeof(**ppStats)); + if(!(*ppStats)) + return E_OUTOFMEMORY; + + (*ppStats)->lpVtbl = &GameStatisticsImplVtbl; + (*ppStats)->ref = 1; + + TRACE("returing coclass: %p\n", *ppStats); + return S_OK; +} + +/******************************************************************************* + * IGameStatisticsMgr implementation + */ typedef struct _GameStatisticsMgrImpl { const struct IGameStatisticsMgrVtbl *lpVtbl; @@ -117,6 +328,7 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( WCHAR lpApplicationId[49]; DWORD dwLength = sizeof(lpApplicationId); GAME_INSTALL_SCOPE installScope; + GameStatisticsImpl *statisticsImpl; TRACE("(%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats); @@ -150,7 +362,13 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( if(SUCCEEDED(hr)) { TRACE("found app id: %s\n", debugstr_w(lpApplicationId)); - FIXME("creating instance of IGameStatistics not yet implemented\n"); + hr = create_IGameStatistics(&statisticsImpl); + } + + if(SUCCEEDED(hr)) + { + *ppiStats = IGameStatistics_from_impl(statisticsImpl); + FIXME("loading game statistics not yet implemented\n"); hr = E_NOTIMPL; } diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 87b1066..7641157 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -239,7 +239,7 @@ static void test_gamestatisticsmgr( void ) /* now, allow to create */ hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs); todo_wine ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%x\n", hr); - todo_wine ok(gs!=NULL, "GetGameStatistics did not return valid interface pointer\n"); + ok(gs!=NULL, "GetGameStatistics did not return valid interface pointer\n"); if(gs) { /* test of limit values returned from interface */

1 0

Mariusz Pluciński : gameux: IGameStatistics:: GetMaxCategoryLength implementation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 26552958f898d24356842c21f1734582769db65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26552958f898d24356842c21f… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 23 15:39:30 2010 +0200 gameux: IGameStatistics::GetMaxCategoryLength implementation. --- dlls/gameux/gamestatistics.c | 9 +++++++-- dlls/gameux/tests/gamestatistics.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 6978173..063fbd5 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); +#define MAX_CATEGORY_LENGTH 60 /******************************************************************************* * IGameStatistics implementation */ @@ -108,8 +109,12 @@ static HRESULT WINAPI GameStatisticsImpl_GetMaxCategoryLength( IGameStatistics *iface, UINT *cch) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, cch); + if(!cch) + return E_INVALIDARG; + + *cch = MAX_CATEGORY_LENGTH; + return S_OK; } static HRESULT WINAPI GameStatisticsImpl_GetMaxNameLength( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 7641157..80e4e91 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -244,8 +244,8 @@ static void test_gamestatisticsmgr( void ) { /* test of limit values returned from interface */ hr = IGameStatistics_GetMaxCategoryLength(gs, &uMaxCategoryLength); - todo_wine ok(hr==S_OK, "getting maximum length of category failed\n"); - todo_wine ok(uMaxCategoryLength==60, "getting maximum length of category returned invalid value: %d\n", uMaxCategoryLength); + ok(hr==S_OK, "getting maximum length of category failed\n"); + ok(uMaxCategoryLength==60, "getting maximum length of category returned invalid value: %d\n", uMaxCategoryLength); hr = IGameStatistics_GetMaxNameLength(gs, &uMaxNameLength); todo_wine ok(hr==S_OK, "getting maximum name length failed\n");

1 0

Mariusz Pluciński : gameux: IGameStatistics:: GetMaxNameLength implementation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 301433b67034983313268022319d4ef4d36a0125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=301433b670349833132680223… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 23 15:39:42 2010 +0200 gameux: IGameStatistics::GetMaxNameLength implementation. --- dlls/gameux/gamestatistics.c | 9 +++++++-- dlls/gameux/tests/gamestatistics.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 063fbd5..905baf2 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); #define MAX_CATEGORY_LENGTH 60 +#define MAX_NAME_LENGTH 30 /******************************************************************************* * IGameStatistics implementation */ @@ -121,8 +122,12 @@ static HRESULT WINAPI GameStatisticsImpl_GetMaxNameLength( IGameStatistics *iface, UINT *cch) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, cch); + if(!cch) + return E_INVALIDARG; + + *cch = MAX_NAME_LENGTH; + return S_OK; } static HRESULT WINAPI GameStatisticsImpl_GetMaxValueLength( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 80e4e91..3904bea 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -248,8 +248,8 @@ static void test_gamestatisticsmgr( void ) ok(uMaxCategoryLength==60, "getting maximum length of category returned invalid value: %d\n", uMaxCategoryLength); hr = IGameStatistics_GetMaxNameLength(gs, &uMaxNameLength); - todo_wine ok(hr==S_OK, "getting maximum name length failed\n"); - todo_wine ok(uMaxNameLength==30, "getting maximum name length returned invalid value: %d\n", uMaxNameLength); + ok(hr==S_OK, "getting maximum name length failed\n"); + ok(uMaxNameLength==30, "getting maximum name length returned invalid value: %d\n", uMaxNameLength); hr = IGameStatistics_GetMaxValueLength(gs, &uMaxValueLength); todo_wine ok(hr==S_OK, "getting maximum value length failed\n");

1 0

Mariusz Pluciński : gameux: IGameStatistics:: GetMaxValueLength implementation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 448ac80fd4e917daf2151e38165a4fe0288358b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448ac80fd4e917daf2151e381… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 23 15:39:49 2010 +0200 gameux: IGameStatistics::GetMaxValueLength implementation. --- dlls/gameux/gamestatistics.c | 9 +++++++-- dlls/gameux/tests/gamestatistics.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 905baf2..f0ee14c 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); #define MAX_CATEGORY_LENGTH 60 #define MAX_NAME_LENGTH 30 +#define MAX_VALUE_LENGTH 30 /******************************************************************************* * IGameStatistics implementation */ @@ -134,8 +135,12 @@ static HRESULT WINAPI GameStatisticsImpl_GetMaxValueLength( IGameStatistics *iface, UINT *cch) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, cch); + if(!cch) + return E_INVALIDARG; + + *cch = MAX_VALUE_LENGTH; + return S_OK; } static HRESULT WINAPI GameStatisticsImpl_GetMaxCategories( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 3904bea..d494d22 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -252,8 +252,8 @@ static void test_gamestatisticsmgr( void ) ok(uMaxNameLength==30, "getting maximum name length returned invalid value: %d\n", uMaxNameLength); hr = IGameStatistics_GetMaxValueLength(gs, &uMaxValueLength); - todo_wine ok(hr==S_OK, "getting maximum value length failed\n"); - todo_wine ok(uMaxValueLength==30, "getting maximum value length returned invalid value: %d\n", uMaxValueLength); + ok(hr==S_OK, "getting maximum value length failed\n"); + ok(uMaxValueLength==30, "getting maximum value length returned invalid value: %d\n", uMaxValueLength); hr = IGameStatistics_GetMaxCategories(gs, &wMaxCategories); todo_wine ok(hr==S_OK, "getting maximum number of categories failed\n");

1 0

Mariusz Pluciński : gameux: IGameStatistics:: GetMaxCategories implementation.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 6dfb5f6a33d6323394a75665cfd93082ed048ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dfb5f6a33d6323394a75665c… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu Sep 23 15:39:57 2010 +0200 gameux: IGameStatistics::GetMaxCategories implementation. --- dlls/gameux/gamestatistics.c | 9 +++++++-- dlls/gameux/tests/gamestatistics.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index f0ee14c..c318eef 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); #define MAX_CATEGORY_LENGTH 60 #define MAX_NAME_LENGTH 30 #define MAX_VALUE_LENGTH 30 +#define MAX_CATEGORIES 10 /******************************************************************************* * IGameStatistics implementation */ @@ -147,8 +148,12 @@ static HRESULT WINAPI GameStatisticsImpl_GetMaxCategories( IGameStatistics *iface, WORD *pMax) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, pMax); + if(!pMax) + return E_INVALIDARG; + + *pMax = MAX_CATEGORIES; + return S_OK; } static HRESULT WINAPI GameStatisticsImpl_GetMaxStatsPerCategory( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index d494d22..e485f9f 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -256,8 +256,8 @@ static void test_gamestatisticsmgr( void ) ok(uMaxValueLength==30, "getting maximum value length returned invalid value: %d\n", uMaxValueLength); hr = IGameStatistics_GetMaxCategories(gs, &wMaxCategories); - todo_wine ok(hr==S_OK, "getting maximum number of categories failed\n"); - todo_wine ok(wMaxCategories==10, "getting maximum number of categories returned invalid value: %d\n", wMaxCategories); + ok(hr==S_OK, "getting maximum number of categories failed\n"); + ok(wMaxCategories==10, "getting maximum number of categories returned invalid value: %d\n", wMaxCategories); hr = IGameStatistics_GetMaxStatsPerCategory(gs, &wMaxStatsPerCategory); todo_wine ok(hr==S_OK, "getting maximum number of statistics per category failed\n");

1 0

Juan Lang : include: Add Vista+ fields to IP_ADAPTER_ADDRESSES.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: 873be06c925e666863d06ae1de08229f5898abc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873be06c925e666863d06ae1d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 13:03:57 2010 -0700 include: Add Vista+ fields to IP_ADAPTER_ADDRESSES. --- include/iptypes.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 82927a9..16e7ffb 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -28,6 +28,8 @@ #define MAX_HOSTNAME_LEN 128 #define MAX_DOMAIN_NAME_LEN 128 #define MAX_SCOPE_ID_LEN 256 +#define MAX_DHCPV6_DUID_LENGTH 130 +#define MAX_DNS_SUFFIX_STRING_LENGTH 256 #define BROADCAST_NODETYPE 1 #define PEER_TO_PEER_NODETYPE 2 @@ -180,6 +182,34 @@ typedef struct _IP_ADAPTER_PREFIX { ULONG PrefixLength; } IP_ADAPTER_PREFIX, *PIP_ADAPTER_PREFIX; +typedef struct _IP_ADAPTER_WINS_SERVER_ADDRESS_LH { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Reserved; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_WINS_SERVER_ADDRESS_LH *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_WINS_SERVER_ADDRESS_LH, *PIP_ADAPTER_WINS_SERVER_ADDRESS_LH; +typedef IP_ADAPTER_WINS_SERVER_ADDRESS_LH IP_ADAPTER_WINS_SERVER_ADDRESS; +typedef IP_ADAPTER_WINS_SERVER_ADDRESS_LH *PIP_ADAPTER_WINS_SERVER_ADDRESS; + +typedef struct _IP_ADAPTER_GATEWAY_ADDRESS_LH { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Reserved; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_GATEWAY_ADDRESS_LH *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_GATEWAY_ADDRESS_LH, *PIP_ADAPTER_GATEWAY_ADDRESS_LH; +typedef IP_ADAPTER_GATEWAY_ADDRESS_LH IP_ADAPTER_GATEWAY_ADDRESS; +typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; + #define IP_ADAPTER_DDNS_ENABLED 0x1 #define IP_ADAPTER_REGISTER_ADAPTER_SUFFIX 0x2 #define IP_ADAPTER_DHCP_ENABLED 0x4 @@ -217,6 +247,22 @@ typedef struct _IP_ADAPTER_ADDRESSES { DWORD Ipv6IfIndex; DWORD ZoneIndices[16]; PIP_ADAPTER_PREFIX FirstPrefix; + ULONG64 TransmitLinkSpeed; + ULONG64 ReceiveLinkSpeed; + PIP_ADAPTER_WINS_SERVER_ADDRESS_LH FirstWinsServerAddress; + PIP_ADAPTER_GATEWAY_ADDRESS_LH FirstGatewayAddress; + ULONG Ipv4Metric; + ULONG Ipv6Metric; + IF_LUID Luid; + SOCKET_ADDRESS Dhcpv4Server; + NET_IF_COMPARTMENT_ID CompartmentId; + NET_IF_NETWORK_GUID NetworkGuid; + NET_IF_CONNECTION_TYPE ConnectionType; + TUNNEL_TYPE TunnelType; + SOCKET_ADDRESS Dhcpv6Server; + BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; + ULONG Dhcpv6ClientDuidLength; + ULONG Dhcpv6Iaid; } IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; #endif /* _WINSOCK2API_ */

1 0

Juan Lang : iphlpapi: Set gateway addresses in GetAdaptersAddresses.
by Alexandre Julliard 24 Sep '10

24 Sep '10

Module: wine Branch: master Commit: f776aea60d5d79c1fbcf7994f945da833e5c342a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f776aea60d5d79c1fbcf7994f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 10:14:18 2010 -0700 iphlpapi: Set gateway addresses in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 94 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 88 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6ec06e8..88b699b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -696,34 +696,82 @@ static char *debugstr_ipv6(const struct WS_sockaddr_in6 *sin, char *buf) return buf; } +static ULONG count_v4_gateways(DWORD index, PMIB_IPFORWARDTABLE routeTable) +{ + DWORD i, num_gateways = 0; + + for (i = 0; i < routeTable->dwNumEntries; i++) + { + if (routeTable->table[i].dwForwardIfIndex == index && + routeTable->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT) + num_gateways++; + } + return num_gateways; +} + +static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, + PMIB_IPFORWARDTABLE routeTable) +{ + DWORD i; + PMIB_IPFORWARDROW row = NULL; + + for (i = 0; !row && i < routeTable->dwNumEntries; i++) + { + if (routeTable->table[i].dwForwardIfIndex == index && + routeTable->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT) + row = &routeTable->table[i]; + } + return row; +} + static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs = 0, num_v6addrs = 0, total_size; + ULONG ret, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; SOCKET_ADDRESS *v6addrs = NULL; + PMIB_IPFORWARDTABLE routeTable = NULL; if (family == AF_INET) - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + { + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); + if (!ret) + { + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + num_v4_gateways = count_v4_gateways(index, routeTable); + } + } else if (family == AF_INET6) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); else if (family == AF_UNSPEC) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); if (!ret) - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + { + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + num_v4_gateways = count_v4_gateways(index, routeTable); + if (!ret) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + } } else { FIXME("address family %u unsupported\n", family); ret = ERROR_NO_DATA; } - if (ret) return ret; + if (ret) + { + HeapFree(GetProcessHeap(), 0, routeTable); + return ret; + } total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; total_size += IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; + total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; for (i = 0; i < num_v6addrs; i++) @@ -751,11 +799,44 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs); + if (num_v4_gateways) + { + PMIB_IPFORWARDROW adapterRow; + + if ((adapterRow = findIPv4Gateway(index, routeTable))) + { + PIP_ADAPTER_GATEWAY_ADDRESS gw; + PSOCKADDR_IN sin; + + for (gw = aa->FirstGatewayAddress; gw && gw->Next; + gw = gw->Next) + ; + if (!gw) + { + gw = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + aa->FirstGatewayAddress = gw; + } + else + { + gw->Next = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + gw = gw->Next; + } + gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); + ptr += sizeof(IP_ADAPTER_GATEWAY_ADDRESS); + sin = (PSOCKADDR_IN)ptr; + sin->sin_family = AF_INET; + sin->sin_port = 0; + memcpy(&sin->sin_addr, &adapterRow->dwForwardNextHop, + sizeof(DWORD)); + gw->Address.lpSockaddr = (LPSOCKADDR)sin; + gw->Address.iSockaddrLength = sizeof(SOCKADDR_IN); + ptr += sizeof(SOCKADDR_IN); + } + } if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; struct sockaddr_in *sa; - aa->Flags |= IP_ADAPTER_IPV4_ENABLED; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) @@ -834,6 +915,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD else aa->OperStatus = IfOperStatusUnknown; } *size = total_size; + HeapFree(GetProcessHeap(), 0, routeTable); HeapFree(GetProcessHeap(), 0, v6addrs); HeapFree(GetProcessHeap(), 0, v4addrs); return ERROR_SUCCESS;

1 0