wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Michael Stefaniuc : dplayx: IDirectPlay and IUnknown share a refcount.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 3b7f969a6bd22e062e388d716fb7f7d9d1dba959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7f969a6bd22e062e388d716… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:19:09 2013 +0200 dplayx: IDirectPlay and IUnknown share a refcount. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/tests/dplayx.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ac39651..c276dba 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectPlay4Impl_QueryInterface( IDirectPlay4 *iface, REFI if ( IsEqualGUID( &IID_IUnknown, riid ) ) { TRACE( "(%p)->(IID_IUnknown %p)\n", This, ppv ); - *ppv = &This->IDirectPlay4A_iface; + *ppv = &This->IDirectPlay_iface; } else if ( IsEqualGUID( &IID_IDirectPlay, riid ) ) { diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 619425d..0e7aafb 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6367,6 +6367,7 @@ static void test_host_migration(void) static void test_COM(void) { + IDirectPlay *dp; IDirectPlay2A *dp2A; IDirectPlay2 *dp2; IDirectPlay3A *dp3A; @@ -6426,14 +6427,22 @@ static void test_COM(void) ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IDirectPlayX_Release(dp4A); + /* IDirectPlay and IUnknown share a refcount */ + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay, (void**)&dp); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay failed: %08x\n", hr); + refcount = IDirectPlayX_AddRef(dp); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay_Release(dp); + hr = IDirectPlayX_QueryInterface(dp4, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); - todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 3, "refcount == %u, expected 3\n", refcount); refcount = IUnknown_Release(unk); - todo_wine ok(refcount == 1, "refcount == %u, expected 1\n", refcount); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IUnknown_Release(unk); + IDirectPlay_Release(dp); IDirectPlayX_Release(dp4A); IDirectPlay3_Release(dp3); IDirectPlay3_Release(dp3A);

1 0

Michael Stefaniuc : dplayx: Add a stub IDirectPlay iface.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: de65abb20094f8ce2bce32ddc71a0b999c7fabeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=de65abb20094f8ce2bce32ddc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:17:36 2013 +0200 dplayx: Add a stub IDirectPlay iface. --- dlls/dplayx/dplay.c | 245 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dplayx/dplay_global.h | 3 +- 2 files changed, 247 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de65abb20094f8ce2bce3…

1 0

Michael Stefaniuc : dplayx/tests: Deal with broken COM aggregation handling on NT4.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: df39c470ed613e7315c0749275c163be997c9b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df39c470ed613e7315c074927… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:16:26 2013 +0200 dplayx/tests: Deal with broken COM aggregation handling on NT4. --- dlls/dplayx/tests/dplayx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 31cddee..619425d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6380,9 +6380,9 @@ static void test_COM(void) /* COM aggregation */ hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)&dp4, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dp4); - ok(hr == CLASS_E_NOAGGREGATION, + ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dp4, "dp4 = %p\n", dp4); + ok(!dp4 || dp4 == (IDirectPlay4*)0xdeadbeef, "dp4 = %p\n", dp4); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby,

1 0

Ken Thomases : winemac: Handle failure to get clipboard format name; don' t use uninitialized buffer.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: cba4bcb47fee29f993d9b722e1d133a85a019add URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba4bcb47fee29f993d9b722e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 8 15:43:13 2013 -0500 winemac: Handle failure to get clipboard format name; don't use uninitialized buffer. --- dlls/winemac.drv/clipboard.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 6dfb2a2..53b1448 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -292,7 +292,13 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) { WCHAR buffer[256]; - GetClipboardFormatNameW(format->format_id, buffer, 256); + if (!GetClipboardFormatNameW(format->format_id, buffer, sizeof(buffer) / sizeof(buffer[0]))) + { + WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), GetLastError()); + HeapFree(GetProcessHeap(), 0, format); + return NULL; + } + if (!strncmpW(buffer, mac_type_name_prefix, strlenW(mac_type_name_prefix))) { const WCHAR *p = buffer + strlenW(mac_type_name_prefix);

1 0

Jacek Caban : wininet: Don' t bother reconnecting to server for compat secure mode if we don' t have compat cred handle.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 77ed56cffbdb51311ccaa52e2752eca6defa7d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ed56cffbdb51311ccaa52e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 16:58:28 2013 +0200 wininet: Don't bother reconnecting to server for compat secure mode if we don't have compat cred handle. --- dlls/wininet/netconnection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c3d700c..b1368bf 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -659,7 +659,7 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) /* FIXME: when got version alert and FIN from server */ /* fallback to connect without TLSv1.1/TLSv1.2 */ - if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) + if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR && have_compat_cred_handle) { closesocket(connection->socket); res = create_netconn_socket(connection->server, connection, 500);

1 0

Piotr Caban : wininet: Skip some urlcache Unicode tests if ANSI version of URL is not known.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: b0ef7b401c5b83418e0d1c2d5f92a0862678f564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ef7b401c5b83418e0d1c2d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:45:35 2013 +0200 wininet: Skip some urlcache Unicode tests if ANSI version of URL is not known. --- dlls/wininet/tests/urlcache.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 724da88..c9acea2 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -893,6 +893,10 @@ static void test_urlcacheW(void) ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size); ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, "%d) GetLastError() = %d\n", i, GetLastError()); + if(!ret && GetLastError()!=ERROR_INSUFFICIENT_BUFFER) { + win_skip("ANSI version of url is incorrect\n"); + continue; + } entry_infoA = HeapAlloc(GetProcessHeap(), 0, size); ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size); ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError());

1 0

Nikolay Sivov : oledb32: Implement DBTYPE_BSTR to DBTYPE_VARIANT conversion .
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 38a362a25ca9e85bcc656d680f9d01187f82d2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a362a25ca9e85bcc656d680… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 7 23:28:33 2013 +0400 oledb32: Implement DBTYPE_BSTR to DBTYPE_VARIANT conversion. --- dlls/oledb32/convert.c | 22 ++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f2c46b0..0e31e4a 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -145,6 +145,8 @@ static int get_length(DBTYPE type) case DBTYPE_STR: case DBTYPE_BYREF | DBTYPE_WSTR: return 0; + case DBTYPE_VARIANT: + return sizeof(VARIANT); default: FIXME("Unhandled type %04x\n", type); return 0; @@ -727,6 +729,26 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return hr; } + case DBTYPE_VARIANT: + { + VARIANT *v = dst; + + switch(src_type) + { + case DBTYPE_BSTR: + { + BSTR s = *(WCHAR**)src; + TRACE("%s\n", debugstr_w(s)); + V_VT(v) = VT_BSTR; + V_BSTR(v) = SysAllocString(s); + hr = V_BSTR(v) ? S_OK : E_OUTOFMEMORY; + } + break; + default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL; + } + break; + } + default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 400ea3d..3c2f661 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2440,6 +2440,7 @@ static void test_getconversionsize(void) IDataConvert *convert; DBLENGTH dst_len; HRESULT hr; + BSTR str; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2461,6 +2462,43 @@ static void test_getconversionsize(void) hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_I4, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* size doesn't include string size */ + str = SysAllocStringLen(NULL, 10); + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_BSTR, DBTYPE_VARIANT, NULL, &dst_len, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == sizeof(VARIANT), "%ld\n", dst_len); + SysFreeString(str); + + IDataConvert_Release(convert); +} + +static void test_converttovar(void) +{ + static WCHAR strW[] = {'t','e','s','t',0}; + IDataConvert *convert; + DBSTATUS dst_status; + DBLENGTH dst_len; + VARIANT dst; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), &dst_len, strW, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_BSTR, "got %d\n", V_VT(&dst)); + ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst))); + VariantClear(&dst); + IDataConvert_Release(convert); } @@ -2482,6 +2520,7 @@ START_TEST(convert) test_converttofiletime(); test_converttocy(); test_converttoui8(); + test_converttovar(); test_getconversionsize(); OleUninitialize(); }

1 0

Nikolay Sivov : oledb32: Implement GetConversionSize for DBTYPE_VARIANT -> DBTYPE_STR case.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 960852f44780742b9bc1099a4b13222ef076cd8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=960852f44780742b9bc1099a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 15:52:31 2013 +0400 oledb32: Implement GetConversionSize for DBTYPE_VARIANT -> DBTYPE_STR case. --- dlls/oledb32/convert.c | 54 ++++++++++++++++++++++++++++++++++++++---- dlls/oledb32/tests/convert.c | 30 +++++++++++++++++++++++ 2 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f56601b..f2c46b0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -996,14 +996,58 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, } static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, - DBTYPE wSrcType, DBTYPE wDstType, - DBLENGTH *pcbSrcLength, DBLENGTH *pcbDstLength, - void *pSrc) + DBTYPE src_type, DBTYPE dst_type, + DBLENGTH *src_len, DBLENGTH *dst_len, + void *src) { convert *This = impl_from_IDataConvert(iface); - FIXME("(%p)->(%d, %d, %p, %p, %p): stub\n", This, wSrcType, wDstType, pcbSrcLength, pcbDstLength, pSrc); + HRESULT hr; + + TRACE("(%p)->(%d, %d, %p, %p, %p)\n", This, src_type, dst_type, src_len, dst_len, src); + + hr = IDataConvert_CanConvert(iface, src_type, dst_type); + if (hr != S_OK) + return DB_E_UNSUPPORTEDCONVERSION; + + if (!dst_len) + return E_INVALIDARG; + + /* for some types we don't need to look into source data */ + if ((*dst_len = get_length(dst_type))) + return S_OK; + + switch (dst_type) + { + case DBTYPE_STR: + { + switch (src_type) + { + case DBTYPE_VARIANT: + { + VARIANT v; - return E_NOTIMPL; + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), -1, NULL, 0, NULL, NULL); + VariantClear(&v); + } + else + return hr; + } + break; + default: + FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type); + return E_NOTIMPL; + } + } + break; + default: + FIXME("unimplemented for destination type %d\n", dst_type); + return E_NOTIMPL; + } + + return S_OK; } static const struct IDataConvertVtbl convert_vtbl = diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index dd80fe4..400ea3d 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2435,6 +2435,35 @@ todo_wine IDataConvert_Release(convert); } +static void test_getconversionsize(void) +{ + IDataConvert *convert; + DBLENGTH dst_len; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + /* same way as CanConvert fails here */ + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_NULL, DBTYPE_BSTR, NULL, &dst_len, NULL); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got 0x%08x\n", hr); + + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_I4, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 4, "got %ld\n", dst_len); + + hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_I4, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); @@ -2453,5 +2482,6 @@ START_TEST(convert) test_converttofiletime(); test_converttocy(); test_converttoui8(); + test_getconversionsize(); OleUninitialize(); }

1 0

Nikolay Sivov : oledb32: Implemented conversion from DBTYPE_VARIANT to DBTYPE_BSTR.
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 15bb6bfa683aacee513e104ec6534921cf8d93c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bb6bfa683aacee513e104ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 14:57:09 2013 +0400 oledb32: Implemented conversion from DBTYPE_VARIANT to DBTYPE_BSTR. --- dlls/oledb32/convert.c | 9 +++++++++ dlls/oledb32/tests/convert.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index badb899..f56601b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -503,6 +503,15 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } } break; + case DBTYPE_VARIANT: + { + VARIANT tmp; + + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + *d = V_BSTR(&tmp); + } + break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 9d50b8a..dd80fe4 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -926,6 +926,7 @@ static void test_converttobstr(void) DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; + VARIANT v; BSTR b; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); @@ -972,6 +973,19 @@ static void test_converttobstr(void) SysFreeString(dst); SysFreeString(b); + b = SysAllocString(ten); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst != NULL, "got %p\n", dst); + ok(dst != b, "got %p src %p\n", dst, b); + ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); + SysFreeString(dst); + SysFreeString(b); + IDataConvert_Release(convert); }

1 0

Nikolay Sivov : gameux: Fix release/free of uninitialized pointers ( Coverity).
by Alexandre Julliard 08 Apr '13

08 Apr '13

Module: wine Branch: master Commit: 0bbd6cb0506bbd820dd9486e24518f81ed02c883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbd6cb0506bbd820dd9486e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 21:47:32 2013 +0400 gameux: Fix release/free of uninitialized pointers (Coverity). --- dlls/gameux/gameexplorer.c | 4 +++- dlls/gameux/gamestatistics.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 8f30601..8400c9e 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -681,7 +681,7 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { HRESULT hr; GAME_INSTALL_SCOPE installScope; LPWSTR lpRegistryPath; - LPWSTR lpGDFBinaryPath, lpGameInstallDirectory; + LPWSTR lpGDFBinaryPath; TRACE("(%s)\n", debugstr_guid(InstanceID)); @@ -702,6 +702,8 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { if(SUCCEEDED(hr)) { + WCHAR *lpGameInstallDirectory = NULL; + /* game found, it's registry path is in lpRegistryPath and install * scope in installScope */ TRACE("game found in registry (path %s), updating\n", debugstr_w(lpRegistryPath)); diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 619c616..54115f1 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -112,7 +112,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) HRESULT hr = S_OK; IXMLDOMDocument *document; - IXMLDOMElement *root, *categoryElement, *statisticsElement; + IXMLDOMElement *root, *statisticsElement; IXMLDOMNode *categoryNode, *statisticsNode; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, @@ -178,6 +178,8 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) for(i=0; i<MAX_CATEGORIES; ++i) { + IXMLDOMElement *categoryElement = NULL; + if(lstrlenW(stats->categories[i].sName)==0) continue; @@ -187,7 +189,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMDocument_createNode(document, vValue, bstrCategory, NULL, &categoryNode); if(SUCCEEDED(hr)) - hr = IXMLDOMNode_QueryInterface(categoryNode, &IID_IXMLDOMElement, (LPVOID*)&categoryElement); + hr = IXMLDOMNode_QueryInterface(categoryNode, &IID_IXMLDOMElement, (void**)&categoryElement); V_INT(&vValue) = i; if(SUCCEEDED(hr)) @@ -207,6 +209,9 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMElement_setAttribute(categoryElement, bstrName, vValue); } + if (categoryElement) + IXMLDOMElement_Release(categoryElement); + SysFreeString(V_BSTR(&vValue)); if(SUCCEEDED(hr)) @@ -269,7 +274,6 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMElement_appendChild(root, categoryNode, &categoryNode); - IXMLDOMElement_Release(categoryElement); IXMLDOMNode_Release(categoryNode); if(FAILED(hr)) @@ -939,16 +943,13 @@ static HRESULT WINAPI GameStatisticsImpl_Save( BOOL trackChanges) { GameStatisticsImpl *This = impl_from_IGameStatistics(iface); - HRESULT hr = S_OK; TRACE("(%p, %d)\n", This, trackChanges); if(trackChanges) FIXME("tracking changes not yet implemented\n"); - hr = GAMEUX_updateStatisticsFile(&This->stats); - - return hr; + return GAMEUX_updateStatisticsFile(&This->stats); } static HRESULT WINAPI GameStatisticsImpl_SetLastPlayedCategory(

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
58
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 April 2013