wine-commits March 2014

2 participants
530 discussions

Thomas Faber : advapi32: Remove unnecessary buffer copy in CredMarshalCredentialW.

by Alexandre Julliard

Module: wine Branch: master Commit: 0868486d179bdce1c4b29e1c596d9d24d00253cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0868486d179bdce1c4b29e1c5… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 29 11:08:34 2014 +0100 advapi32: Remove unnecessary buffer copy in CredMarshalCredentialW. --- dlls/advapi32/cred.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index f407c0d..2d98ecc 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1952,18 +1952,13 @@ BOOL WINAPI CredMarshalCredentialW( CRED_MARSHAL_TYPE type, PVOID cred, LPWSTR * { case CertCredential: { - char hash[CERT_HASH_LENGTH + 2]; - - memcpy( hash, cert->rgbHashOfCert, sizeof(cert->rgbHashOfCert) ); - memset( hash + sizeof(cert->rgbHashOfCert), 0, sizeof(hash) - sizeof(cert->rgbHashOfCert) ); - - size = sizeof(hash) * 4 / 3; + size = (sizeof(cert->rgbHashOfCert) + 2) * 4 / 3; if (!(p = HeapAlloc( GetProcessHeap(), 0, (size + 4) * sizeof(WCHAR) ))) return FALSE; p[0] = '@'; p[1] = '@'; p[2] = 'A' + type; - len = cred_encode( (const char *)hash, sizeof(hash), p + 3 ); - p[len] = 0; + len = cred_encode( (const char *)cert->rgbHashOfCert, sizeof(cert->rgbHashOfCert), p + 3 ); + p[len + 3] = 0; break; } case UsernameTargetCredential:

10 years, 1 month

Thomas Faber : advapi32: Fix stack corruption in CredIsMarshaledCredentialW.

by Alexandre Julliard

Module: wine Branch: master Commit: f9fae1b3f619a5ff70cdf397dcbba197d64a10d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fae1b3f619a5ff70cdf397d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Dec 20 00:17:35 2013 +0100 advapi32: Fix stack corruption in CredIsMarshaledCredentialW. In its currrent implementation, cred_decode with input length 6 writes 6 bytes to the output buffer. This overflows the DWORD passed in CredIsMarshaledCredentialW. --- dlls/advapi32/cred.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 3bfc885..f407c0d 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -2049,7 +2049,6 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) buf[i + 0] = (c1 << 6) | c0; buf[i + 1] = (c2 << 4) | (c1 >> 2); - buf[i + 2] = c2 >> 4; } else if (len == 2) { @@ -2057,16 +2056,10 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) if ((c1 = char_decode( p[1] )) > 63) return FALSE; buf[i + 0] = (c1 << 6) | c0; - buf[i + 1] = c1 >> 2; - buf[i + 2] = 0; } else if (len == 1) { - if ((c0 = char_decode( p[0] )) > 63) return FALSE; - - buf[i + 0] = c0; - buf[i + 1] = 0; - buf[i + 2] = 0; + return FALSE; } return TRUE; } @@ -2090,7 +2083,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO { case CertCredential: { - char hash[CERT_HASH_LENGTH + 2]; + char hash[CERT_HASH_LENGTH]; CERT_CREDENTIAL_INFO *cert; if (len != 27 || !cred_decode( cred + 3, len, hash )) @@ -2108,7 +2101,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO case UsernameTargetCredential: { USERNAME_TARGET_CREDENTIAL_INFO *target; - ULONGLONG size = 0; + DWORD size; if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR) || size > INT_MAX) @@ -2157,7 +2150,7 @@ BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR name) if (name && name[0] == '@' && name[1] == '@' && name[2] > 'A' && name[3]) { - char hash[CERT_HASH_LENGTH + 2]; + char hash[CERT_HASH_LENGTH]; int len = strlenW(name + 3 ); DWORD size;

10 years, 1 month

Julian Rüger : po: Update German translation.

by Alexandre Julliard

Module: wine Branch: master Commit: c810f07f4012bce7ee4dd4d307571ca0be68c994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c810f07f4012bce7ee4dd4d30… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Mar 29 15:04:42 2014 +0100 po: Update German translation. --- po/de.po | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/po/de.po b/po/de.po index 35a2455..7939791 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-02 22:42+0100\n" +"PO-Revision-Date: 2014-03-29 15:03+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -6593,10 +6593,8 @@ msgid "The username could not be found.\n" msgstr "Der Benutzername konnte nicht gefunden werden.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "Die Seite existiert nicht.\n" +msgstr "Diese Netzwerkverbindung existiert nicht.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -11752,6 +11750,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL-Registrierungsserver\n" +"\n" +"Stellt Dienste zur DLL-Registrierung bereit.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11766,54 +11768,65 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Aufruf:\n" +" regsvr32 [/u] [/s] [/n] [/i[:Befehlszeile]] DllName\n" +"\n" +"Optionen:\n" +" [/u] Registrierung eines Moduls vom Server aufheben.\n" +" [/s] Stiller Modus (es werden keine Meldungen angezeigt).\n" +" [/i] DllInstall mit einer optionalen [Befehlszeile] aufrufen.\n" +"\tBei Angabe von [/u], ruft regsvr32 auch DLL Uninstall auf.\n" +" [/n] DllRegisterServer nicht aufrufen. Muss in Verbindung mit [/i]\n" +"\tbenutzt werden.\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Ungültiges oder nicht erkanntes Argument [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "'%1' konnte nicht geöffnet werden\n" +msgstr "regsvr32: DLL '%1' konnte nicht geladen werden\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1 nicht in DLL '%2' implementiert\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' konnte nicht registriert werden\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' erfolgreich registriert\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Registrierung von DLL '%1' konnte nicht aufgehoben werden\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Registrierung von DLL '%1' erfolgreich aufgehoben\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' konnte nicht installiert werden\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' erfolgreich installiert\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' konnte nicht deinstalliert werden\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' erfolgreich deinstalliert\n" #: start.rc:55 msgid ""

10 years, 1 month

Francois Gouget : netcfgx/tests: Make create_configuration() static.

by Alexandre Julliard

Module: wine Branch: master Commit: 16b94cdd23e90c88fea2621d90bbd88ac5ec33d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b94cdd23e90c88fea2621d9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 31 11:26:04 2014 +0200 netcfgx/tests: Make create_configuration() static. --- dlls/netcfgx/tests/netcfgx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 2a9f0eb..084f8cd 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -23,7 +23,7 @@ #include "netcfgx.h" #include "wine/test.h" -void create_configuration(void) +static void create_configuration(void) { static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0};

10 years, 1 month

Francois Gouget : wbemprox/tests: Make test_GetNames() static.

by Alexandre Julliard

Module: wine Branch: master Commit: 1eb2e8b3e142a4fe99e20c59aecc33f3d0e3da58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb2e8b3e142a4fe99e20c59a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 31 11:25:54 2014 +0200 wbemprox/tests: Make test_GetNames() static. --- dlls/wbemprox/tests/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e99e4ea..d244dad 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -616,7 +616,7 @@ static void test_query_async( IWbemServices *services ) SysFreeString( query ); } -void test_GetNames( IWbemServices *services ) +static void test_GetNames( IWbemServices *services ) { static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_',

10 years, 1 month

Nikolay Sivov : msxml3/tests: Check return values (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 93bd41c3f79dc9a5a7dcdbd9217da0317b11ce87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93bd41c3f79dc9a5a7dcdbd92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 16:07:41 2014 +0400 msxml3/tests: Check return values (Coverity). --- dlls/msxml3/tests/domdoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dd40133..aaa895a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6077,7 +6077,8 @@ static void test_save(void) hr = IXMLDOMDocument_loadXML(doc, _bstr_("<a/>"), &b); EXPECT_HR(hr, S_OK); - CreateStreamOnHGlobal(NULL, TRUE, &stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); V_VT(&dest) = VT_UNKNOWN; V_UNKNOWN(&dest) = (IUnknown*)stream; hr = IXMLDOMDocument_save(doc, dest); @@ -8417,7 +8418,8 @@ todo_wine { hr = IXSLProcessor_put_output(processor, v); ok(hr == S_OK, "got 0x%08x\n", hr); - CreateStreamOnHGlobal(NULL, TRUE, &stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(stream, 1); V_VT(&v) = VT_UNKNOWN; @@ -10316,7 +10318,8 @@ static void test_dispex(void) doc = create_document(&IID_IXMLDOMDocument); - IXMLDOMDocument_QueryInterface(doc, &IID_IUnknown, (void**)&unk); + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); test_domobj_dispex(unk); IUnknown_Release(unk); @@ -10349,7 +10352,8 @@ static void test_dispex(void) /* IXMLDOMNodeList for children list */ hr = IXMLDOMDocument_get_childNodes(doc, &node_list); EXPECT_HR(hr, S_OK); - IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); test_domobj_dispex(unk); IUnknown_Release(unk);

10 years, 1 month

Nikolay Sivov : qcap/tests: Check method return values (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: ddbcd24178455f108d510b22016dc0347cf53b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbcd24178455f108d510b220… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 16:07:11 2014 +0400 qcap/tests: Check method return values (Coverity). --- dlls/qcap/tests/qcap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 4ad4d7c..19177bd 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1055,9 +1055,12 @@ static HRESULT WINAPI MemInputPin_Receive(IMemInputPin *iface, IMediaSample *pSa REFERENCE_TIME off, tmp; LARGE_INTEGER li; BYTE *data; + HRESULT hr; - IMediaSample_GetTime(pSample, &off, &tmp); - IMediaSample_GetPointer(pSample, &data); + hr = IMediaSample_GetTime(pSample, &off, &tmp); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMediaSample_GetPointer(pSample, &data); + ok(hr == S_OK, "got 0x%08x\n", hr); li.QuadPart = off; IStream_Seek(avi_stream, li, STREAM_SEEK_SET, NULL); IStream_Write(avi_stream, data, IMediaSample_GetActualDataLength(pSample), NULL); @@ -1826,7 +1829,8 @@ static void test_AviMux(char *arg) ok(memalloc != &MemAllocator, "memalloc == &MemAllocator\n"); IMemAllocator_Release(memalloc); - CreateStreamOnHGlobal(NULL, TRUE, &avi_stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &avi_stream); + ok(hr == S_OK, "got 0x%08x\n", hr); SET_EXPECT(MediaSeeking_GetPositions); SET_EXPECT(MemInputPin_QueryInterface_IStream); hr = IBaseFilter_Run(avimux, 0);

10 years, 1 month

Nikolay Sivov : scrrun: Implement DriveLetter property for a drive.

by Alexandre Julliard

Module: wine Branch: master Commit: c824cfa08c5a0e66b0fc75ebee1a5e2af56e86e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c824cfa08c5a0e66b0fc75ebe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 15:59:17 2014 +0400 scrrun: Implement DriveLetter property for a drive. --- dlls/scrrun/filesystem.c | 13 +++++++++++-- dlls/scrrun/tests/filesystem.c | 9 +++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a1eb6c1..cd0ec2b 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -687,8 +687,17 @@ static HRESULT WINAPI drive_get_Path(IDrive *iface, BSTR *path) static HRESULT WINAPI drive_get_DriveLetter(IDrive *iface, BSTR *letter) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, letter); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, letter); + + if (!letter) + return E_POINTER; + + *letter = SysAllocStringLen(This->root, 1); + if (!*letter) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI drive_get_ShareName(IDrive *iface, BSTR *share_name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3bf1209..d947d15 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1240,10 +1240,19 @@ static void test_DriveCollection(void) while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { IDrive *drive = (IDrive*)V_DISPATCH(&var); DriveTypeConst type; + BSTR str; hr = IDrive_get_DriveType(drive, &type); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDrive_get_DriveLetter(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDrive_get_DriveLetter(drive, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(SysStringLen(str) == 1, "got string %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hr = IDrive_get_IsReady(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr);

10 years, 1 month

Nikolay Sivov : scrrun: Implement AvailableSpace property for a drive.

by Alexandre Julliard

Module: wine Branch: master Commit: 61a3bd330210e21842b010c536422c18dac55eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a3bd330210e21842b010c53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 15:59:00 2014 +0400 scrrun: Implement AvailableSpace property for a drive. --- dlls/scrrun/filesystem.c | 16 +++++++++++++--- dlls/scrrun/tests/filesystem.c | 9 +++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 04d649d..a1eb6c1 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -736,11 +736,21 @@ static HRESULT WINAPI drive_get_RootFolder(IDrive *iface, IFolder **folder) return E_NOTIMPL; } -static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *avail) +static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, avail); - return E_NOTIMPL; + ULARGE_INTEGER avail; + + TRACE("(%p)->(%p)\n", This, v); + + if (!v) + return E_POINTER; + + if (!GetDiskFreeSpaceExW(This->root, &avail, NULL, NULL)) + return E_FAIL; + + V_VT(v) = VT_R8; + return VarR8FromUI8(avail.QuadPart, &V_R8(v)); } static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 215df42..3bf1209 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1250,6 +1250,9 @@ static void test_DriveCollection(void) hr = IDrive_get_TotalSize(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IDrive_get_AvailableSpace(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + if (type == Fixed) { VARIANT_BOOL ready = VARIANT_FALSE; VARIANT size; @@ -1263,6 +1266,12 @@ static void test_DriveCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + + V_VT(&size) = VT_EMPTY; + hr = IDrive_get_AvailableSpace(drive, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); } VariantClear(&var); }

10 years, 1 month

Nikolay Sivov : scrrun: Implement TotalSize property for a drive.

by Alexandre Julliard

Module: wine Branch: master Commit: 2377fc099daf467e9b77e4e9d71d89f5b8d84554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2377fc099daf467e9b77e4e9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 15:58:45 2014 +0400 scrrun: Implement TotalSize property for a drive. --- dlls/scrrun/filesystem.c | 14 ++++++++++++-- dlls/scrrun/tests/filesystem.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d963719..04d649d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -753,8 +753,18 @@ static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, v); - return E_NOTIMPL; + ULARGE_INTEGER total; + + TRACE("(%p)->(%p)\n", This, v); + + if (!v) + return E_POINTER; + + if (!GetDiskFreeSpaceExW(This->root, NULL, &total, NULL)) + return E_FAIL; + + V_VT(v) = VT_R8; + return VarR8FromUI8(total.QuadPart, &V_R8(v)); } static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 4128bf5..215df42 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1247,12 +1247,22 @@ static void test_DriveCollection(void) hr = IDrive_get_IsReady(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IDrive_get_TotalSize(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + if (type == Fixed) { VARIANT_BOOL ready = VARIANT_FALSE; + VARIANT size; hr = IDrive_get_IsReady(drive, &ready); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ready == VARIANT_TRUE, "got %x\n", ready); + + V_VT(&size) = VT_EMPTY; + hr = IDrive_get_TotalSize(drive, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); } VariantClear(&var); }

10 years, 1 month

Jump to page:

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 March 2014