wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Vincent Povirk : ktmw32: Add stub dll.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 8f87459baa2fd7d67723b9b0cd6e65576a0fe797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f87459baa2fd7d67723b9b0c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 26 16:38:44 2010 -0500 ktmw32: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/ktmw32/Makefile.in | 6 ++++++ dlls/ktmw32/ktmw32.spec | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ktmw32/ktmw32_main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f1f9435..436bbae 100755 --- a/configure +++ b/configure @@ -14685,6 +14685,7 @@ wine_fn_config_dll kernel32 enable_kernel32 kernel32 wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll keyboard.drv16 enable_win16 wine_fn_config_dll krnl386.exe16 enable_win16 kernel +wine_fn_config_dll ktmw32 enable_ktmw32 wine_fn_config_dll loadperf enable_loadperf loadperf wine_fn_config_dll localspl enable_localspl wine_fn_config_test dlls/localspl/tests localspl_test diff --git a/configure.ac b/configure.ac index 341ba18..fb85cac 100644 --- a/configure.ac +++ b/configure.ac @@ -2463,6 +2463,7 @@ WINE_CONFIG_DLL(kernel32,,[kernel32]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[kernel]) +WINE_CONFIG_DLL(ktmw32) WINE_CONFIG_DLL(loadperf,,[loadperf]) WINE_CONFIG_DLL(localspl) WINE_CONFIG_TEST(dlls/localspl/tests) diff --git a/dlls/ktmw32/Makefile.in b/dlls/ktmw32/Makefile.in new file mode 100644 index 0000000..62c41d8 --- /dev/null +++ b/dlls/ktmw32/Makefile.in @@ -0,0 +1,6 @@ +MODULE = ktmw32.dll + +C_SRCS = \ + ktmw32_main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/ktmw32/ktmw32.spec b/dlls/ktmw32/ktmw32.spec new file mode 100644 index 0000000..062f1f2 --- /dev/null +++ b/dlls/ktmw32/ktmw32.spec @@ -0,0 +1,44 @@ +@ stub CommitComplete +@ stub CommitEnlistment +@ stub CommitTransaction +@ stub CommitTransactionAsync +@ stub CreateEnlistment +@ stub CreateResourceManager +@ stub CreateTransaction +@ stub CreateTransactionManager +@ stub GetCurrentClockTransactionManager +@ stub GetEnlistmentId +@ stub GetEnlistmentRecoveryInformation +@ stub GetNotificationResourceManager +@ stub GetNotificationResourceManagerAsync +@ stub GetTransactionId +@ stub GetTransactionInformation +@ stub GetTransactionManagerId +@ stub OpenEnlistment +@ stub OpenResourceManager +@ stub OpenTransaction +@ stub OpenTransactionManager +@ stub OpenTransactionManagerById +@ stub PrePrepareComplete +@ stub PrePrepareEnlistment +@ stub PrepareComplete +@ stub PrepareEnlistment +@ stub PrivCreateTransaction +@ stub PrivIsLogWritableTransactionManager +@ stub PrivPropagationComplete +@ stub PrivPropagationFailed +@ stub PrivRegisterProtocolAddressInformation +@ stub ReadOnlyEnlistment +@ stub RecoverEnlistment +@ stub RecoverResourceManager +@ stub RecoverTransactionManager +@ stub RenameTransactionManager +@ stub RollbackComplete +@ stub RollbackEnlistment +@ stub RollbackTransaction +@ stub RollbackTransactionAsync +@ stub RollforwardTransactionManager +@ stub SetEnlistmentRecoveryInformation +@ stub SetResourceManagerCompletionPort +@ stub SetTransactionInformation +@ stub SinglePhaseReject diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c new file mode 100644 index 0000000..960def2 --- /dev/null +++ b/dlls/ktmw32/ktmw32_main.c @@ -0,0 +1,43 @@ +/* + * Copyright 2010 Vincent Povirk for CodeWeavers + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ktm); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +}

1 0

Mariusz Pluciński : gameux: Finished implementation of saving game statistics.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: d87a7613449fc4172fc2db792ad984527dcf2722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87a7613449fc4172fc2db792… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Sep 26 15:04:58 2010 +0200 gameux: Finished implementation of saving game statistics. --- dlls/gameux/gamestatistics.c | 168 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index a82f03a..0cce059 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -104,12 +104,20 @@ static HRESULT GAMEUX_createStatsDirectory(LPCWSTR lpFilePath) static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { static const WCHAR sStatistics[] = {'S','t','a','t','i','s','t','i','c','s',0}; + static const WCHAR sCategory[] = {'C','a','t','e','g','o','r','y',0}; + static const WCHAR sIndex[] = {'I','n','d','e','x',0}; + static const WCHAR sStatistic[] = {'S','t','a','t','i','s','t','i','c',0}; + static const WCHAR sName[] = {'N','a','m','e',0}; + static const WCHAR sValue[] = {'V','a','l','u','e',0}; HRESULT hr = S_OK; IXMLDOMDocument *document; - IXMLDOMElement *root; - VARIANT vStatsFilePath; - BSTR bstrStatistics = NULL; + IXMLDOMElement *root, *categoryElement, *statisticsElement; + IXMLDOMNode *categoryNode, *statisticsNode; + VARIANT vStatsFilePath, vValue; + BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, + bstrStatistic = NULL, bstrName = NULL, bstrValue = NULL; + int i, j; TRACE("(%p)\n", stats); @@ -132,7 +140,150 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_createElement(document, bstrStatistics, &root); - FIXME("writing statistics not fully implemented\n"); + if(SUCCEEDED(hr)) + { + bstrCategory = SysAllocString(sCategory); + if(!bstrCategory) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + bstrIndex = SysAllocString(sIndex); + if(!bstrIndex) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + bstrStatistic = SysAllocString(sStatistic); + if(!bstrStatistic) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + bstrName = SysAllocString(sName); + if(!bstrName) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + bstrValue = SysAllocString(sValue); + if(!bstrValue) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + + if(SUCCEEDED(hr)) + for(i=0; i<MAX_CATEGORIES; ++i) + { + if(lstrlenW(stats->categories[i].sName)==0) + continue; + + V_VT(&vValue) = VT_INT; + V_INT(&vValue) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(document, vValue, bstrCategory, NULL, &categoryNode); + + if(SUCCEEDED(hr)) + hr = IXMLDOMNode_QueryInterface(categoryNode, &IID_IXMLDOMElement, (LPVOID*)&categoryElement); + + V_INT(&vValue) = i; + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_setAttribute(categoryElement, bstrIndex, vValue); + + if(SUCCEEDED(hr)) + { + V_VT(&vValue) = VT_BSTR; + V_BSTR(&vValue) = SysAllocString(stats->categories[i].sName); + if(!V_BSTR(&vValue)) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + TRACE("storing category %d: %s\n", i, debugstr_w(V_BSTR(&vValue))); + hr = IXMLDOMElement_setAttribute(categoryElement, bstrName, vValue); + } + + SysFreeString(V_BSTR(&vValue)); + + if(SUCCEEDED(hr)) + { + for(j=0; j<MAX_STATS_PER_CATEGORY; ++j) + { + if(lstrlenW(stats->categories[i].stats[j].sName)==0) + continue; + + V_VT(&vValue) = VT_INT; + V_INT(&vValue) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(document, vValue, bstrStatistic, NULL, &statisticsNode); + + if(SUCCEEDED(hr)) + hr = IXMLDOMNode_QueryInterface(statisticsNode, &IID_IXMLDOMElement, (LPVOID*)&statisticsElement); + + V_INT(&vValue) = j; + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_setAttribute(statisticsElement, bstrIndex, vValue); + + if(SUCCEEDED(hr)) + { + V_VT(&vValue) = VT_BSTR; + V_BSTR(&vValue) = SysAllocString(stats->categories[i].stats[j].sName); + if(!V_BSTR(&vValue)) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + TRACE(" storing statistic %d: name: %s\n", j, debugstr_w(V_BSTR(&vValue))); + hr = IXMLDOMElement_setAttribute(statisticsElement, bstrName, vValue); + } + + SysFreeString(V_BSTR(&vValue)); + + if(SUCCEEDED(hr)) + { + V_VT(&vValue) = VT_BSTR; + V_BSTR(&vValue) = SysAllocString(stats->categories[i].stats[j].sValue); + if(!V_BSTR(&vValue)) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + TRACE(" storing statistic %d: name: %s\n", j, debugstr_w(V_BSTR(&vValue))); + hr = IXMLDOMElement_setAttribute(statisticsElement, bstrValue, vValue); + } + + SysFreeString(V_BSTR(&vValue)); + + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_appendChild(categoryNode, statisticsNode, &statisticsNode); + + IXMLDOMElement_Release(statisticsElement); + IXMLDOMNode_Release(statisticsNode); + } + } + + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_appendChild(root, categoryNode, &categoryNode); + + IXMLDOMElement_Release(categoryElement); + IXMLDOMNode_Release(categoryNode); + + if(FAILED(hr)) + break; + } + + if(SUCCEEDED(hr)) + hr = IXMLDOMDocument_putref_documentElement(document, root); + + IXMLDOMElement_Release(root); TRACE("saving game statistics in %s file\n", debugstr_w(stats->sStatsFile)); if(SUCCEEDED(hr)) @@ -141,8 +292,15 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_save(document, vStatsFilePath); - SysFreeString(V_BSTR(&vStatsFilePath)); + IXMLDOMDocument_Release(document); + + SysFreeString(bstrValue); + SysFreeString(bstrName); + SysFreeString(bstrStatistic); + SysFreeString(bstrIndex); + SysFreeString(bstrCategory); SysFreeString(bstrStatistics); + SysFreeString(V_BSTR(&vStatsFilePath)); TRACE("ret=0x%x\n", hr); return hr; }

1 0

Mariusz Pluciński : gameux: Add implementation of IGameStatisticsMgr::RemoveGameStatistics.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 5cac9d2cb2c020802a56a5b1b28348316f1087ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cac9d2cb2c020802a56a5b1b… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Sep 26 15:04:04 2010 +0200 gameux: Add implementation of IGameStatisticsMgr::RemoveGameStatistics. --- dlls/gameux/gamestatistics.c | 114 +++++++++++++++++++++++------------- dlls/gameux/tests/gamestatistics.c | 4 +- 2 files changed, 76 insertions(+), 42 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 83ee5cd..a82f03a 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -183,6 +183,64 @@ static HRESULT GAMEUX_buildStatisticsFilePath( return hr; } +/******************************************************************************* + * GAMEUX_getAppIdFromGDFPath + * + * Loads application identifier associated with given GDF binary. + * Routine reads identifier from registry, so will fail if game + * is not registered. + * + * Parameters: + * GDFBinaryPath [I] path to gdf binary + * lpApplicationId [O] place to store application id. + * must be at least 49 characters + * to store guid and termination 0 + */ +static HRESULT GAMEUX_getAppIdFromGDFPath( + LPCWSTR GDFBinaryPath, + LPWSTR lpApplicationId) +{ + static const WCHAR sApplicationId[] = + {'A','p','p','l','i','c','a','t','i','o','n','I','d',0}; + + HRESULT hr; + GAME_INSTALL_SCOPE installScope; + GUID instanceId; + LPWSTR lpRegistryPath; + DWORD dwLength = 49*sizeof(WCHAR);/* place for GUID */ + + TRACE("(%s, %p)\n", debugstr_w(GDFBinaryPath), lpApplicationId); + + 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)); + + HeapFree(GetProcessHeap(), 0, lpRegistryPath); + + TRACE("found app id: %s, return: %#x\n", debugstr_w(lpApplicationId), hr); + return hr; +} /******************************************************************* * IGameStatistics implementation */ @@ -560,51 +618,16 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( GAMESTATS_OPEN_RESULT *pOpenResult, IGameStatistics **ppiStats) { - 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; GameStatisticsImpl *statisticsImpl; 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; + hr = GAMEUX_getAppIdFromGDFPath(GDFBinaryPath, lpApplicationId); 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)); hr = create_IGameStatistics(&statisticsImpl); - } if(SUCCEEDED(hr)) { @@ -618,8 +641,6 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( hr = E_NOTIMPL; } - HeapFree(GetProcessHeap(), 0, lpRegistryPath); - return hr; } @@ -627,8 +648,21 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_RemoveGameStatistics( IGameStatisticsMgr* iface, LPCWSTR GDFBinaryPath) { - FIXME("stub (%p, %s)\n", iface, debugstr_w(GDFBinaryPath)); - return E_NOTIMPL; + HRESULT hr; + WCHAR lpApplicationId[49]; + WCHAR sStatsFile[MAX_PATH]; + + TRACE("(%p, %s)\n", iface, debugstr_w(GDFBinaryPath)); + + hr = GAMEUX_getAppIdFromGDFPath(GDFBinaryPath, lpApplicationId); + + if(SUCCEEDED(hr)) + hr = GAMEUX_buildStatisticsFilePath(lpApplicationId, sStatsFile); + + if(SUCCEEDED(hr)) + hr = (DeleteFileW(sStatsFile)==TRUE ? S_OK : HRESULT_FROM_WIN32(GetLastError())); + + return hr; } static const struct IGameStatisticsMgrVtbl GameStatisticsMgrImplVtbl = diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 759f6d5..29bfcf3 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -414,8 +414,8 @@ static void test_gamestatisticsmgr( void ) /* test of removing game statistics from underlying storage */ ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); hr = IGameStatisticsMgr_RemoveGameStatistics(gsm, sExeName); - todo_wine ok(SUCCEEDED(hr), "cannot remove game statistics, error: 0x%x\n", hr); - todo_wine ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s still exists\n", wine_dbgstr_w(lpStatisticsFile)); + ok(SUCCEEDED(hr), "cannot remove game statistics, error: 0x%x\n", hr); + ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s still exists\n", wine_dbgstr_w(lpStatisticsFile)); } hr = IGameStatisticsMgr_Release(gsm);

1 0

Mariusz Pluciński : gameux: IGameStatistics:: Save initial implementation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: ef3a1ab53a1b772d1efffd0ee6a40c057469f24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3a1ab53a1b772d1efffd0ee… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Sep 26 15:02:43 2010 +0200 gameux: IGameStatistics::Save initial implementation. --- dlls/gameux/gamestatistics.c | 139 +++++++++++++++++++++++++++++++++++- dlls/gameux/tests/gamestatistics.c | 8 +- 2 files changed, 141 insertions(+), 6 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index a4c88a4..83ee5cd 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -23,6 +23,9 @@ #include "ole2.h" #include "winreg.h" +#include "msxml2.h" +#include "shlwapi.h" +#include "shlobj.h" #include "gameux.h" #include "gameux_private.h" @@ -63,6 +66,124 @@ struct GAMEUX_STATS struct GAMEUX_STATS_CATEGORY categories[MAX_CATEGORIES]; }; /******************************************************************************* + * GAMEUX_createStatsDirectory + * + * Helper function, creates directory to store game statistics + * + * Parameters + * path [I] path to game statistics file. + * base directory of this file will + * be created if it doesn't exists + */ +static HRESULT GAMEUX_createStatsDirectory(LPCWSTR lpFilePath) +{ + HRESULT hr; + WCHAR lpDirectoryPath[MAX_PATH]; + LPCWSTR lpEnd; + + lpEnd = StrRChrW(lpFilePath, NULL, '\\'); + lstrcpynW(lpDirectoryPath, lpFilePath, lpEnd-lpFilePath+1); + + hr = HRESULT_FROM_WIN32(SHCreateDirectoryExW(NULL, lpDirectoryPath, NULL)); + + if(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS) || + hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) + hr = S_FALSE; + + return hr; +} +/******************************************************************* + * GAMEUX_updateStatisticsFile + * + * Helper function updating data stored in statistics file + * + * Parameters: + * data [I] pointer to struct containing + * statistics data + */ +static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) +{ + static const WCHAR sStatistics[] = {'S','t','a','t','i','s','t','i','c','s',0}; + + HRESULT hr = S_OK; + IXMLDOMDocument *document; + IXMLDOMElement *root; + VARIANT vStatsFilePath; + BSTR bstrStatistics = NULL; + + TRACE("(%p)\n", stats); + + V_VT(&vStatsFilePath) = VT_BSTR; + V_BSTR(&vStatsFilePath) = SysAllocString(stats->sStatsFile); + if(!V_BSTR(&vStatsFilePath)) + hr = E_OUTOFMEMORY; + + if(SUCCEEDED(hr)) + hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void**)&document); + + if(SUCCEEDED(hr)) + { + bstrStatistics = SysAllocString(sStatistics); + if(!bstrStatistics) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + hr = IXMLDOMDocument_createElement(document, bstrStatistics, &root); + + FIXME("writing statistics not fully implemented\n"); + + TRACE("saving game statistics in %s file\n", debugstr_w(stats->sStatsFile)); + if(SUCCEEDED(hr)) + hr = GAMEUX_createStatsDirectory(stats->sStatsFile); + + if(SUCCEEDED(hr)) + hr = IXMLDOMDocument_save(document, vStatsFilePath); + + SysFreeString(V_BSTR(&vStatsFilePath)); + SysFreeString(bstrStatistics); + TRACE("ret=0x%x\n", hr); + return hr; +} +/******************************************************************************* + * GAMEUX_buildStatisticsFilePath + * Creates path to file contaning statistics of game with given id. + * + * Parameters: + * lpApplicationId [I] application id of game, + * as string + * lpStatisticsFile [O] array where path will be + * stored. It's size must be + * at least MAX_PATH + */ +static HRESULT GAMEUX_buildStatisticsFilePath( + LPCWSTR lpApplicationId, + LPWSTR lpStatisticsFile) +{ + static const WCHAR sBackslash[] = {'\\',0}; + static const WCHAR sStatisticsDir[] = {'\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p', + 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', + 't','i','c','s',0}; + static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; + + HRESULT hr; + + hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, lpStatisticsFile); + + if(SUCCEEDED(hr)) + { + lstrcatW(lpStatisticsFile, sStatisticsDir); + lstrcatW(lpStatisticsFile, lpApplicationId); + lstrcatW(lpStatisticsFile, sBackslash); + lstrcatW(lpStatisticsFile, lpApplicationId); + lstrcatW(lpStatisticsFile, sDotGamestats); + } + + return hr; +} +/******************************************************************* * IGameStatistics implementation */ typedef struct _GameStatisticsImpl @@ -299,8 +420,17 @@ static HRESULT WINAPI GameStatisticsImpl_Save( IGameStatistics *iface, BOOL trackChanges) { - FIXME("stub\n"); - return E_NOTIMPL; + GameStatisticsImpl *This = impl_from_IGameStatistics(iface); + HRESULT hr = S_OK; + + TRACE("(%p, %d)\n", This, trackChanges); + + if(trackChanges == TRUE) + FIXME("tracking changes not yet implemented\n"); + + hr = GAMEUX_updateStatisticsFile(&This->stats); + + return hr; } static HRESULT WINAPI GameStatisticsImpl_SetLastPlayedCategory( @@ -479,6 +609,11 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( if(SUCCEEDED(hr)) { *ppiStats = IGameStatistics_from_impl(statisticsImpl); + hr = GAMEUX_buildStatisticsFilePath(lpApplicationId, statisticsImpl->stats.sStatsFile); + } + + if(SUCCEEDED(hr)) + { 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 491aecb..759f6d5 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -328,9 +328,9 @@ static void test_gamestatisticsmgr( void ) ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s already exists\n", wine_dbgstr_w(lpStatisticsFile)); - todo_wine ok(IGameStatistics_Save(gs, FALSE)==S_OK, "statistic saving failed\n"); + ok(IGameStatistics_Save(gs, FALSE)==S_OK, "statistic saving failed\n"); - todo_wine ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); + ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); /* this value should not be stored in storage, we need it only to test is it not saved */ ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0a)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0a)); @@ -412,10 +412,10 @@ static void test_gamestatisticsmgr( void ) ok(SUCCEEDED(hr), "releasing IGameStatistics returned error: 0x%x\n", hr); /* test of removing game statistics from underlying storage */ - todo_wine ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); + ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); hr = IGameStatisticsMgr_RemoveGameStatistics(gsm, sExeName); todo_wine ok(SUCCEEDED(hr), "cannot remove game statistics, error: 0x%x\n", hr); - ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s still exists\n", wine_dbgstr_w(lpStatisticsFile)); + todo_wine ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s still exists\n", wine_dbgstr_w(lpStatisticsFile)); } hr = IGameStatisticsMgr_Release(gsm);

1 0

Mariusz Pluciński : gameux: Add implementation of IGameStatistics::SetStatistic.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: ce28a5f2621e7954241fa5df42d7c77ae47a2c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce28a5f2621e7954241fa5df4… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Sep 26 15:00:40 2010 +0200 gameux: Add implementation of IGameStatistics::SetStatistic. --- dlls/gameux/gamestatistics.c | 44 ++++++++++++++++++++++++++++++++++- dlls/gameux/tests/gamestatistics.c | 26 ++++++++++---------- 2 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 67bfc08..a4c88a4 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -251,8 +251,48 @@ static HRESULT WINAPI GameStatisticsImpl_SetStatistic( LPCWSTR name, LPCWSTR value) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr = S_OK; + DWORD dwNameLen, dwValueLen; + GameStatisticsImpl *This = impl_from_IGameStatistics(iface); + + TRACE("(%p, %d, %d, %s, %s)\n", This, categoryIndex, statIndex, + debugstr_w(name), debugstr_w(value)); + + if(!name) + return S_FALSE; + + if(categoryIndex >= MAX_CATEGORIES || statIndex >= MAX_STATS_PER_CATEGORY) + return E_INVALIDARG; + + dwNameLen = lstrlenW(name); + + if(dwNameLen > MAX_NAME_LENGTH) + { + hr = S_FALSE; + dwNameLen = MAX_NAME_LENGTH; + } + + lstrcpynW(This->stats.categories[categoryIndex].stats[statIndex].sName, + name, dwNameLen+1); + + if(value) + { + dwValueLen = lstrlenW(value); + + if(dwValueLen > MAX_VALUE_LENGTH) + { + hr = S_FALSE; + dwValueLen = MAX_VALUE_LENGTH; + } + + lstrcpynW(This->stats.categories[categoryIndex].stats[statIndex].sValue, + value, dwValueLen+1); + } + else + /* Windows allows to pass NULL as value */ + This->stats.categories[categoryIndex].stats[statIndex].sValue[0] = 0; + + return hr; } static HRESULT WINAPI GameStatisticsImpl_Save( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index e62368a..491aecb 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -292,39 +292,39 @@ static void test_gamestatisticsmgr( void ) /* check what happen if any string is NULL */ hr = IGameStatistics_SetStatistic(gs, 0, 0, NULL, sValue00); - todo_wine ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); + ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); hr = IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, NULL); - todo_wine ok(hr == S_OK, "setting statistic returned unexpected value: 0x%x)\n", hr); + ok(hr == S_OK, "setting statistic returned unexpected value: 0x%x)\n", hr); /* check what happen if any string is too long */ sTooLongString = CoTaskMemAlloc(sizeof(WCHAR)*(uMaxNameLength+2)); memset(sTooLongString, 'a', sizeof(WCHAR)*(uMaxNameLength+1)); sTooLongString[uMaxNameLength+1]=0; hr = IGameStatistics_SetStatistic(gs, 0, 0, sTooLongString, sValue00); - todo_wine ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); + ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); CoTaskMemFree(sTooLongString); sTooLongString = CoTaskMemAlloc(sizeof(WCHAR)*(uMaxValueLength+2)); memset(sTooLongString, 'a', sizeof(WCHAR)*(uMaxValueLength+1)); sTooLongString[uMaxValueLength+1]=0; hr = IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, sTooLongString); - todo_wine ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); + ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); CoTaskMemFree(sTooLongString); /* check what happen on too big index of category or statistic */ hr = IGameStatistics_SetStatistic(gs, wMaxCategories, 0, sStatistic00, sValue00); - todo_wine ok(hr == E_INVALIDARG, "setting statistic returned unexpected value: 0x%x)\n", hr); + ok(hr == E_INVALIDARG, "setting statistic returned unexpected value: 0x%x)\n", hr); hr = IGameStatistics_SetStatistic(gs, 0, wMaxStatsPerCategory, sStatistic00, sValue00); - todo_wine ok(hr == E_INVALIDARG, "setting statistic returned unexpected value: 0x%x)\n", hr); - - todo_wine ok(IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, sValue00)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic00), wine_dbgstr_w(sValue00)); - todo_wine ok(IGameStatistics_SetStatistic(gs, 0, 1, sStatistic01, sValue01)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic01), wine_dbgstr_w(sValue01)); - todo_wine ok(IGameStatistics_SetStatistic(gs, 1, 0, sStatistic10, sValue10)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic10), wine_dbgstr_w(sValue10)); - todo_wine ok(IGameStatistics_SetStatistic(gs, 1, 1, sStatistic11, sValue11)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic11), wine_dbgstr_w(sValue11)); - todo_wine ok(IGameStatistics_SetStatistic(gs, 2, 0, sStatistic20, sValue20)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic20), wine_dbgstr_w(sValue20)); - todo_wine ok(IGameStatistics_SetStatistic(gs, 2, 1, sStatistic21, sValue21)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic21), wine_dbgstr_w(sValue21)); + ok(hr == E_INVALIDARG, "setting statistic returned unexpected value: 0x%x)\n", hr); + + ok(IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, sValue00)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic00), wine_dbgstr_w(sValue00)); + ok(IGameStatistics_SetStatistic(gs, 0, 1, sStatistic01, sValue01)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic01), wine_dbgstr_w(sValue01)); + ok(IGameStatistics_SetStatistic(gs, 1, 0, sStatistic10, sValue10)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic10), wine_dbgstr_w(sValue10)); + ok(IGameStatistics_SetStatistic(gs, 1, 1, sStatistic11, sValue11)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic11), wine_dbgstr_w(sValue11)); + ok(IGameStatistics_SetStatistic(gs, 2, 0, sStatistic20, sValue20)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic20), wine_dbgstr_w(sValue20)); + ok(IGameStatistics_SetStatistic(gs, 2, 1, sStatistic21, sValue21)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic21), wine_dbgstr_w(sValue21)); ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s already exists\n", wine_dbgstr_w(lpStatisticsFile));

1 0

Mariusz Pluciński : gameux: Add implementation of IGameStatistics::SetCategoryTitle.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 35692e40b113c950a8969ec1a438889332045d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35692e40b113c950a8969ec1a… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Sep 26 15:17:41 2010 +0200 gameux: Add implementation of IGameStatistics::SetCategoryTitle. --- dlls/gameux/gamestatistics.c | 47 ++++++++++++++++++++++++++++++++++- dlls/gameux/tests/gamestatistics.c | 14 +++++----- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 44cc04e..67bfc08 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -40,12 +40,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); #define MAX_CATEGORIES 10 #define MAX_STATS_PER_CATEGORY 10 /******************************************************************************* + * Game statistics helper components + */ +/******************************************************************************* + * struct GAMEUX_STATS + * + * set of structures for containing game's data + */ +struct GAMEUX_STATS_STAT +{ + WCHAR sName[MAX_NAME_LENGTH+1]; + WCHAR sValue[MAX_VALUE_LENGTH+1]; +}; +struct GAMEUX_STATS_CATEGORY +{ + WCHAR sName[MAX_CATEGORY_LENGTH+1]; + struct GAMEUX_STATS_STAT stats[MAX_STATS_PER_CATEGORY]; +}; +struct GAMEUX_STATS +{ + WCHAR sStatsFile[MAX_PATH]; + struct GAMEUX_STATS_CATEGORY categories[MAX_CATEGORIES]; +}; +/******************************************************************************* * IGameStatistics implementation */ typedef struct _GameStatisticsImpl { const struct IGameStatisticsVtbl *lpVtbl; LONG ref; + struct GAMEUX_STATS stats; } GameStatisticsImpl; static inline GameStatisticsImpl *impl_from_IGameStatistics( IGameStatistics *iface ) @@ -177,8 +201,27 @@ static HRESULT WINAPI GameStatisticsImpl_SetCategoryTitle( WORD categoryIndex, LPCWSTR title) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr = S_OK; + DWORD dwLength; + GameStatisticsImpl *This = impl_from_IGameStatistics(iface); + + TRACE("(%p, %d, %s)\n", This, categoryIndex, debugstr_w(title)); + + if(!title || categoryIndex >= MAX_CATEGORIES) + return E_INVALIDARG; + + dwLength = lstrlenW(title); + + if(dwLength > MAX_CATEGORY_LENGTH) + { + hr = S_FALSE; + dwLength = MAX_CATEGORY_LENGTH; + } + + lstrcpynW(This->stats.categories[categoryIndex].sName, + title, dwLength+1); + + return hr; } static HRESULT WINAPI GameStatisticsImpl_GetCategoryTitle( diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 30e1fcd..e62368a 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -271,10 +271,10 @@ static void test_gamestatisticsmgr( void ) /* write sample statistics */ hr = IGameStatistics_SetCategoryTitle(gs, wMaxCategories, NULL); - todo_wine ok(hr==E_INVALIDARG, "setting category title invalid value: 0x%x\n", hr); + ok(hr==E_INVALIDARG, "setting category title invalid value: 0x%x\n", hr); hr = IGameStatistics_SetCategoryTitle(gs, wMaxCategories, sCategory0); - todo_wine ok(hr==E_INVALIDARG, "setting category title invalid value: 0x%x\n", hr); + ok(hr==E_INVALIDARG, "setting category title invalid value: 0x%x\n", hr); /* check what happen if string is too long */ sTooLongString = CoTaskMemAlloc(sizeof(WCHAR)*(uMaxCategoryLength+2)); @@ -283,12 +283,12 @@ static void test_gamestatisticsmgr( void ) /* when string is too long, Windows returns S_FALSE, but saves string (stripped to expected number of characters) */ hr = IGameStatistics_SetCategoryTitle(gs, 0, sTooLongString); - todo_wine ok(hr==S_FALSE, "setting category title invalid result: 0x%x\n", hr); + ok(hr==S_FALSE, "setting category title invalid result: 0x%x\n", hr); CoTaskMemFree(sTooLongString); - todo_wine ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0)); - todo_wine ok(IGameStatistics_SetCategoryTitle(gs, 1, sCategory1)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory1)); - todo_wine ok(IGameStatistics_SetCategoryTitle(gs, 2, sCategory2)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory1)); + ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0)); + ok(IGameStatistics_SetCategoryTitle(gs, 1, sCategory1)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory1)); + ok(IGameStatistics_SetCategoryTitle(gs, 2, sCategory2)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory1)); /* check what happen if any string is NULL */ hr = IGameStatistics_SetStatistic(gs, 0, 0, NULL, sValue00); @@ -333,7 +333,7 @@ static void test_gamestatisticsmgr( void ) todo_wine ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); /* this value should not be stored in storage, we need it only to test is it not saved */ - todo_wine ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0a)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0a)); + ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0a)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0a)); hr = IGameStatistics_Release(gs); ok(SUCCEEDED(hr), "releasing IGameStatistics returned error: 0x%08x\n", hr);

1 0

Vincent Pelletier : msvcp90: Direct basic_string::operator=(char const *) to existing implementation.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 6fa52cd37da936aff9b873bfd95b986f2fa6b0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa52cd37da936aff9b873bfd… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Sep 25 12:16:20 2010 +0200 msvcp90: Direct basic_string::operator=(char const *) to existing implementation. --- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index eda3b7c..f05b53d 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -1382,8 +1382,8 @@ @ stub -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z @ stub -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z @ stub -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z -@ stub -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z -@ stub -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@PEBD@Z +@ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z(ptr ptr) msvcp90.??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z +@ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@PEBD@Z(ptr ptr) msvcp90.??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@PEBD@Z @ stub -arch=win32 ??4?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV01@AEBV01@@Z @ stub -arch=win32 ??4?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@G@Z diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d7f368a..9ed37ec 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1384,8 +1384,8 @@ @ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_assign @ stub -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z @ stub -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z -@ stub -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z -@ stub -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@PEBD@Z +@ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z(ptr ptr) MSVCP_basic_string_char_assign_cstr +@ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@PEBD@Z(ptr ptr) MSVCP_basic_string_char_assign_cstr @ stub -arch=win32 ??4?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV01@AEBV01@@Z @ stub -arch=win32 ??4?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@G@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index fad3346..cc4ff1b 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -679,6 +679,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr_len( /* ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z */ /* ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD@Z */ +/* ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z */ +/* ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@PEBD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_cstr, 8) basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr( basic_string_char *this, const char *str)

1 0

Vitaly Perov : comdlg32: Add basic implementation of PrintDlgExA.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: dcef05b6f1efc9d43825e8f1de6c0e9ad06c8537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcef05b6f1efc9d43825e8f1d… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Sep 23 15:53:21 2010 +0300 comdlg32: Add basic implementation of PrintDlgExA. --- dlls/comdlg32/printdlg.c | 89 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 0bb3a7b..05d9401 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -5,6 +5,7 @@ * Copyright 1996 Albrecht Kleine * Copyright 1999 Klaas van Gend * Copyright 2000 Huw D M Davies + * Copyright 2010 Vitaly Perov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3752,14 +3753,94 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) */ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) { + DWORD ret = E_FAIL; + LPVOID ptr; - FIXME("(%p) stub\n", lppd); - if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXA))) { + FIXME("(%p) not fully implemented\n", lppd); + if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXA))) return E_INVALIDARG; - } - if (!IsWindow(lppd->hwndOwner)) { + if (!IsWindow(lppd->hwndOwner)) return E_HANDLE; + + if (lppd->Flags & PD_RETURNDEFAULT) + { + PRINTER_INFO_2A *pbuf; + DRIVER_INFO_2A *dbuf; + HANDLE hprn; + DWORD needed = 1024; + BOOL bRet; + + if (lppd->hDevMode || lppd->hDevNames) + { + WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n"); + COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); + return E_INVALIDARG; + } + if (!PRINTDLG_OpenDefaultPrinter(&hprn)) + { + WARN("Can't find default printer\n"); + COMDLG32_SetCommDlgExtendedError(PDERR_NODEFAULTPRN); + return E_FAIL; + } + + pbuf = HeapAlloc(GetProcessHeap(), 0, needed); + bRet = GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed); + if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + HeapFree(GetProcessHeap(), 0, pbuf); + pbuf = HeapAlloc(GetProcessHeap(), 0, needed); + bRet = GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed); + } + if (!bRet) + { + HeapFree(GetProcessHeap(), 0, pbuf); + ClosePrinter(hprn); + return E_FAIL; + } + + needed = 1024; + dbuf = HeapAlloc(GetProcessHeap(), 0, needed); + bRet = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); + if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + HeapFree(GetProcessHeap(), 0, dbuf); + dbuf = HeapAlloc(GetProcessHeap(), 0, needed); + bRet = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); + } + if (!bRet) + { + ERR("GetPrinterDriverА failed, last error %d, fix your config for printer %s!\n", + GetLastError(), pbuf->pPrinterName); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); + COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); + ClosePrinter(hprn); + return E_FAIL; + } + ClosePrinter(hprn); + + PRINTDLG_CreateDevNames(&(lppd->hDevNames), + dbuf->pDriverPath, + pbuf->pPrinterName, + pbuf->pPortName); + lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, pbuf->pDevMode->dmSize + + pbuf->pDevMode->dmDriverExtra); + if (lppd->hDevMode) + { + ptr = GlobalLock(lppd->hDevMode); + if (ptr) + { + memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize + + pbuf->pDevMode->dmDriverExtra); + GlobalUnlock(lppd->hDevMode); + ret = S_OK; + } + } + HeapFree(GetProcessHeap(), 0, pbuf); + HeapFree(GetProcessHeap(), 0, dbuf); + + return ret; } return E_NOTIMPL;

1 0

Alexandre Julliard : kernel32/nls: Define the neutral and reading layout locale values.
by Alexandre Julliard 27 Sep '10

27 Sep '10

1 0

Alexandre Julliard : kernel32: Implemented EnumSystemLocalesEx.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 9f792ab3d56acdf38eaba06734667df001c976b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f792ab3d56acdf38eaba0673… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 14:03:12 2010 +0200 kernel32: Implemented EnumSystemLocalesEx. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/locale.c | 49 +++++++++++++++++++++++++++-------------- include/winnls.h | 19 ++++++++++++++++ 4 files changed, 101 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 43e339b..e4ce77e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -324,6 +324,7 @@ @ stdcall EnumSystemLanguageGroupsA(ptr long ptr) @ stdcall EnumSystemLanguageGroupsW(ptr long ptr) @ stdcall EnumSystemLocalesA(ptr long) +@ stdcall EnumSystemLocalesEx(ptr long long ptr) @ stdcall EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) @ stdcall EnumTimeFormatsW(ptr long long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 168bb19..927d058 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2222,6 +2222,55 @@ BOOL WINAPI EnumSystemLocalesW( LOCALE_ENUMPROCW lpfnLocaleEnum, DWORD dwFlags ) } +struct enum_locale_ex_data +{ + LOCALE_ENUMPROCEX proc; + DWORD flags; + LPARAM lparam; +}; + +static BOOL CALLBACK enum_locale_ex_proc( HMODULE module, LPCWSTR type, + LPCWSTR name, WORD lang, LONG_PTR lparam ) +{ + struct enum_locale_ex_data *data = (struct enum_locale_ex_data *)lparam; + WCHAR buffer[256]; + DWORD neutral; + unsigned int flags; + + GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, + buffer, sizeof(buffer) / sizeof(WCHAR) ); + if (!GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), + LOCALE_INEUTRAL | LOCALE_NOUSEROVERRIDE | LOCALE_RETURN_NUMBER, + (LPWSTR)&neutral, sizeof(neutral) / sizeof(WCHAR) )) + neutral = 0; + flags = LOCALE_WINDOWS; + flags |= neutral ? LOCALE_NEUTRALDATA : LOCALE_SPECIFICDATA; + if (data->flags && ~(data->flags & flags)) return TRUE; + return data->proc( buffer, flags, data->lparam ); +} + +/****************************************************************************** + * EnumSystemLocalesEx (KERNEL32.@) + */ +BOOL WINAPI EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD flags, LPARAM lparam, LPVOID reserved ) +{ + struct enum_locale_ex_data data; + + if (reserved) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + data.proc = proc; + data.flags = flags; + data.lparam = lparam; + EnumResourceLanguagesW( kernel32_handle, (LPCWSTR)RT_STRING, + (LPCWSTR)MAKEINTRESOURCE((LOCALE_SNAME >> 4) + 1), + enum_locale_ex_proc, (LONG_PTR)&data ); + return TRUE; +} + + /*********************************************************************** * VerLanguageNameA (KERNEL32.@) * diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9d6f7e4..34b5f00 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -67,23 +67,13 @@ static inline int isdigitW( WCHAR wc ) static HMODULE hKernel32; static WORD enumCount; -typedef BOOL (WINAPI *EnumSystemLanguageGroupsAFn)(LANGUAGEGROUP_ENUMPROC, - DWORD, LONG_PTR); -static EnumSystemLanguageGroupsAFn pEnumSystemLanguageGroupsA; -typedef BOOL (WINAPI *EnumLanguageGroupLocalesAFn)(LANGGROUPLOCALE_ENUMPROC, - LGRPID, DWORD, LONG_PTR); -static EnumLanguageGroupLocalesAFn pEnumLanguageGroupLocalesA; -typedef BOOL (WINAPI *EnumUILanguagesAFn)(UILANGUAGE_ENUMPROC, - DWORD, LONG_PTR); -static EnumUILanguagesAFn pEnumUILanguagesA; - -typedef INT (WINAPI *FoldStringAFn)(DWORD, LPCSTR, INT, LPSTR, INT); -static FoldStringAFn pFoldStringA; -typedef INT (WINAPI *FoldStringWFn)(DWORD, LPCWSTR, INT, LPWSTR, INT); -static FoldStringWFn pFoldStringW; - -typedef BOOL (WINAPI *IsValidLanguageGroupFn)(LGRPID, DWORD); -static IsValidLanguageGroupFn pIsValidLanguageGroup; +static BOOL (WINAPI *pEnumSystemLanguageGroupsA)(LANGUAGEGROUP_ENUMPROC, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC, LGRPID, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumUILanguagesA)(UILANGUAGE_ENUMPROC, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumSystemLocalesEx)(LOCALE_ENUMPROCEX, DWORD, LPARAM, LPVOID); +static INT (WINAPI *pFoldStringA)(DWORD, LPCSTR, INT, LPSTR, INT); +static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); +static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); static void InitFunctionPointers(void) { @@ -94,6 +84,7 @@ static void InitFunctionPointers(void) pFoldStringW = (void*)GetProcAddress(hKernel32, "FoldStringW"); pIsValidLanguageGroup = (void*)GetProcAddress(hKernel32, "IsValidLanguageGroup"); pEnumUILanguagesA = (void*)GetProcAddress(hKernel32, "EnumUILanguagesA"); + pEnumSystemLocalesEx = (void*)GetProcAddress(hKernel32, "EnumSystemLocalesEx"); } #define eq(received, expected, label, type) \ @@ -2346,6 +2337,29 @@ static void test_EnumSystemLanguageGroupsA(void) pEnumSystemLanguageGroupsA(langgrp_procA, LGRPID_SUPPORTED, 0); } +static BOOL CALLBACK enum_func( LPWSTR name, DWORD flags, LPARAM lparam ) +{ + trace( "%s %x\n", wine_dbgstr_w(name), flags ); + return TRUE; +} + +static void test_EnumSystemLocalesEx(void) +{ + BOOL ret; + + if (!pEnumSystemLocalesEx) + { + win_skip( "EnumSystemLocalesEx not available\n" ); + return; + } + SetLastError( 0xdeadbeef ); + ret = pEnumSystemLocalesEx( enum_func, LOCALE_ALL, 0, (void *)1 ); + ok( !ret, "should have failed\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pEnumSystemLocalesEx( enum_func, 0, 0, NULL ); + ok( ret, "failed err %u\n", GetLastError() ); +} static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, LONG_PTR lParam) @@ -2801,6 +2815,7 @@ START_TEST(locale) test_FoldStringW(); test_ConvertDefaultLocale(); test_EnumSystemLanguageGroupsA(); + test_EnumSystemLocalesEx(); test_EnumLanguageGroupLocalesA(); test_SetLocaleInfoA(); test_EnumUILanguageA(); diff --git a/include/winnls.h b/include/winnls.h index b75e24a..279c944 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -150,6 +150,14 @@ extern "C" { #define LCID_SUPPORTED 0x2 #define LCID_ALTERNATE_SORTS 0x4 +#define LOCALE_ALL 0x00 +#define LOCALE_WINDOWS 0x01 +#define LOCALE_SUPPLEMENTAL 0x02 +#define LOCALE_ALTERNATE_SORTS 0x04 +#define LOCALE_REPLACEMENT 0x08 +#define LOCALE_NEUTRALDATA 0x10 +#define LOCALE_SPECIFICDATA 0x20 + /* Locale flags */ #define LOCALE_NOUSEROVERRIDE 0x80000000 #define LOCALE_USE_CP_ACP 0x40000000 @@ -279,6 +287,16 @@ extern "C" { #define LOCALE_SPARENT 0x006D #define LOCALE_SCONSOLEFALLBACKNAME 0x006E #define LOCALE_SLANGDISPLAYNAME 0x006F +#define LOCALE_IREADINGLAYOUT 0x0070 +#define LOCALE_INEUTRAL 0x0071 +#define LOCALE_INEGATIVEPERCENT 0x0074 +#define LOCALE_IPOSITIVEPERCENT 0x0075 +#define LOCALE_SPERCENT 0x0076 +#define LOCALE_SPERMILLE 0x0077 +#define LOCALE_SMONTHDAY 0x0078 +#define LOCALE_SSHORTTIME 0x0079 +#define LOCALE_SOPENTYPELANGUAGETAG 0X007A +#define LOCALE_SSORTLOCALE 0x007B #define LOCALE_IDEFAULTEBCDICCODEPAGE 0x1012 #define LOCALE_IPAPERSIZE 0x100A @@ -624,6 +642,7 @@ typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCA)(LGRPID,LPSTR,LPSTR,DWORD,LON typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCW)(LGRPID,LPWSTR,LPWSTR,DWORD,LONG_PTR); typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR); +typedef BOOL (CALLBACK *LOCALE_ENUMPROCEX)(LPWSTR, DWORD, LPARAM); typedef BOOL (CALLBACK *TIMEFMT_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *TIMEFMT_ENUMPROCW)(LPWSTR); typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCA)(LPSTR,LONG_PTR);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
86
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 September 2010