October 2019 - Wine-Devel - list.winehq.org

[PATCH v2] oledb32: Support Milliseconds when converting BSTR -> DBTIMESTAMP
by Alistair Leslie-Hughes Oct. 20, 2019

Oct. 20, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 30 ++++++++++++++++++++++++++++-- dlls/oledb32/tests/convert.c | 29 +++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a5bbdbc245..95fbb52943 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -546,13 +546,15 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break; case DBTYPE_BSTR: { + BOOL doretry = TRUE; VARIANT var; + DWORD milliseconds = 0; BSTR s = *(WCHAR**)src; VariantInit(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(s); - +retry: if ((hr = VariantChangeType(&var, &var, 0, VT_DATE)) == S_OK) { SYSTEMTIME st; @@ -564,7 +566,31 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->hour = st.wHour; d->minute = st.wMinute; d->second = st.wSecond; - d->fraction = st.wMilliseconds * 1000000; + d->fraction = milliseconds; + } + else if(doretry) + { + /* Must be in the format 2013-05-14 02:04:12.017 */ + WCHAR *slash = wcschr(s, '-'); + WCHAR *pos = wcsrchr(s, '.'); + + doretry = FALSE; + + if(!pos || !slash) + { + hr = DISP_E_TYPEMISMATCH; + *dst_status = DBSTATUS_E_CANTCONVERTVALUE; + *dst_len = get_length(dst_type); + } + else + { + SysFreeString(V_BSTR(&var)); + V_BSTR(&var) = SysAllocStringLen(s, pos-s); + + milliseconds = wcstol(pos+1, NULL, 10); + + goto retry; + } } VariantClear(&var); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 51fd2f7fa3..73c9430bfd 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3919,8 +3919,12 @@ static void test_converttovar(void) static void test_converttotimestamp(void) { static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; + static const WCHAR str1W[] = {'2','0','1','3','/','0','5','/','1','4',' ','0','2','.','0','4','.','1','2',0}; static const WCHAR strFullW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2', '.','0','1','7','0','0','0','0','0','0',0}; + static const WCHAR strFull1W[] = {'2','0','1','3','/','0','5','/','1','4',' ','0','2',':','0','4',':','1','2', + '.','0','1','7',0}; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; DATE date; @@ -3950,13 +3954,30 @@ static void test_converttotimestamp(void) ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); SysFreeString(bstr); + bstr = SysAllocString(str1W); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &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(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); + SysFreeString(bstr); + bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + 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(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(strFull1W); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DISP_E_TYPEMISMATCH, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); SysFreeString(bstr); V_VT(&var) = VT_NULL; -- 2.17.1

1 0

[PATCH] dinput/tests: Remove unrequired pointer checks (Coverity)
by Alistair Leslie-Hughes Oct. 20, 2019

Oct. 20, 2019

Also fixes a few test strings. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/tests/device.c | 8 ++++---- dlls/dinput/tests/keyboard.c | 4 ++-- dlls/dinput/tests/mouse.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index fa9b6f1436..a2a5a65686 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -190,15 +190,15 @@ static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) trace("Testing device %p \"%s\"\n", device, lpddi->tszInstanceName); hr = IUnknown_QueryInterface(device, &IID_IDirectInputDevice2A, (LPVOID*)&obj); - ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice7A) failed: %08x\n", hr); + ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice2A) failed: %08x\n", hr); test_object_info(obj, data->hwnd); - if (obj) IUnknown_Release(obj); + IUnknown_Release(obj); obj = NULL; hr = IUnknown_QueryInterface(device, &IID_IDirectInputDevice2W, (LPVOID*)&obj); - ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice7W) failed: %08x\n", hr); + ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice2W) failed: %08x\n", hr); test_object_info(obj, data->hwnd); - if (obj) IUnknown_Release(obj); + IUnknown_Release(obj); IUnknown_Release(device); } diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 0e399f021c..84e6fed078 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -182,7 +182,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_Unacquire(pKeyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); - if (pKeyboard) IUnknown_Release(pKeyboard); + IUnknown_Release(pKeyboard); ActivateKeyboardLayout(hkl_orig, 0); UnloadKeyboardLayout(hkl); @@ -272,7 +272,7 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_RANGE, &diprg.diph); ok(hr == DIERR_UNSUPPORTED, "IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x\n", hr); - if (pKeyboard) IUnknown_Release(pKeyboard); + IUnknown_Release(pKeyboard); } static void test_capabilities(IDirectInputA *pDI, HWND hwnd) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 11da951d10..19d1c3708b 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -198,7 +198,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) /* Granularity of Y axis should be 1! */ ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); - if (pMouse) IUnknown_Release(pMouse); + IUnknown_Release(pMouse); DestroyWindow( hwnd2 ); } @@ -259,7 +259,7 @@ static void test_mouse_EnumObjects(IDirectInputA *pDI) hr = IDirectInputDevice_EnumObjects(pMouse, EnumAxes, NULL, DIDFT_ALL); ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); - if (pMouse) IUnknown_Release(pMouse); + IUnknown_Release(pMouse); } static void mouse_tests(void) -- 2.23.0

2 2

[PATCH] comdlg32/tests: Use win_skip() instead when appropriate.
by Nikolay Sivov Oct. 20, 2019

Oct. 20, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Maybe it's time we remove dynamically accessed PrintDlgExW. dlls/comdlg32/tests/itemdlg.c | 2 +- dlls/comdlg32/tests/printdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 787c4e48e8..6ee0d5fc3d 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -441,7 +441,7 @@ static BOOL test_instantiation(void) &IID_IFileSaveDialog, (void**)&pfsd); if(FAILED(hr)) { - skip("Could not instantiate the FileSaveDialog.\n"); + win_skip("Could not instantiate the FileSaveDialog.\n"); return FALSE; } ok(hr == S_OK, "got 0x%08x.\n", hr); diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 4c6a47355c..0376872e67 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -375,7 +375,7 @@ static void test_PrintDlgExW(void) /* PrintDlgEx not present before w2k */ if (!pPrintDlgExW) { - skip("PrintDlgExW not available\n"); + win_skip("PrintDlgExW not available\n"); return; } -- 2.23.0

2 1

[PATCH] t2embed/tests: Fix some test failures on Win10.
by Nikolay Sivov Oct. 20, 2019

Oct. 20, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/t2embed/tests/t2embed.c | 40 +++++++++++++++++------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 9f278a57d1..4ffc3daed1 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -43,19 +43,22 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm UINT fsType = otm.otmfsType & 0xf; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE, "got %d\n", ret); - - if (fsType == LICENSE_INSTALLABLE) - expected = EMBED_INSTALLABLE; - else if (fsType & LICENSE_EDITABLE) - expected = EMBED_EDITABLE; - else if (fsType & LICENSE_PREVIEWPRINT) - expected = EMBED_PREVIEWPRINT; - else if (fsType & LICENSE_NOEMBEDDING) - expected = EMBED_NOEMBEDDING; - - ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, - expected, otm.otmfsType); + ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#x.\n", ret); + + if (ret == E_NONE) + { + if (fsType == LICENSE_INSTALLABLE) + expected = EMBED_INSTALLABLE; + else if (fsType & LICENSE_EDITABLE) + expected = EMBED_EDITABLE; + else if (fsType & LICENSE_PREVIEWPRINT) + expected = EMBED_PREVIEWPRINT; + else if (fsType & LICENSE_NOEMBEDDING) + expected = EMBED_NOEMBEDDING; + + ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + expected, otm.otmfsType); + } } else { @@ -170,14 +173,6 @@ static void test_TTIsEmbeddingEnabled(void) hdc = CreateCompatibleDC(0); - ret = TTIsEmbeddingEnabled(hdc, NULL); - ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); - - status = 123; - ret = TTIsEmbeddingEnabled(hdc, &status); - ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); - ok(status == 123, "got %u\n", status); - memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWeight = FW_NORMAL; @@ -187,6 +182,9 @@ static void test_TTIsEmbeddingEnabled(void) old_font = SelectObject(hdc, hfont); + ret = TTIsEmbeddingEnabled(hdc, NULL); + ok(ret == E_PBENABLEDINVALID, "Unexpected return value %#x.\n", ret); + status = 123; ret = TTIsEmbeddingEnabled(hdc, &status); ok(ret == E_NONE, "got %#x\n", ret); -- 2.23.0

1 0

[PATCH] dwrite/tests: Relax tests that fail on some Win10 versions.
by Nikolay Sivov Oct. 20, 2019

Oct. 20, 2019

GetString() return value contradicts other methods,and partially buffer writes don't happen elsewhere. It's not worth to replicate this. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 32156fdedd..c2f9dc0b1f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1738,7 +1738,7 @@ static void test_GetFamilyNames(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); hr = IDWriteLocalizedStrings_GetString(names, 10, NULL, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); if (0) hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100); @@ -1751,12 +1751,12 @@ static void test_GetFamilyNames(void) buffer[0] = 1; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len-1); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - ok(buffer[0] == 0, "got %x\n", buffer[0]); + ok(buffer[0] == 0 || broken(buffer[0] == 'T'), "Unexpected buffer contents, %#x.\n", buffer[0]); buffer[0] = 1; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - ok(buffer[0] == 0, "got %x\n", buffer[0]); + ok(buffer[0] == 0 || broken(buffer[0] == 'T'), "Unexpected buffer contents, %#x.\n", buffer[0]); buffer[0] = 0; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len+1); -- 2.23.0

1 0

[PATCH] mf: Leave instead of enter a critical section.
by Sven Baars Oct. 20, 2019

Oct. 20, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mf/samplegrabber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index c3dc2e1b7f..205bc70b1b 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1040,7 +1040,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; } - EnterCriticalSection(&grabber->cs); + LeaveCriticalSection(&grabber->cs); return hr; } -- 2.17.1

2 1

[PATCH v2 1/6] setupapi: Rewrite DiskSpaceList logic using lists.
by Vijay Kiran Kamuju Oct. 20, 2019

Oct. 20, 2019

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/diskspace.c | 183 +++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 82 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index f5e79d5327c9..4f047dd2b544 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -1,6 +1,7 @@ /* * SetupAPI DiskSpace functions * + * Copyright 2016 Michael Müller * Copyright 2004 CodeWeavers (Aric Stewart) * * This library is free software; you can redistribute it and/or @@ -27,69 +28,50 @@ #include "winnls.h" #include "winreg.h" #include "setupapi.h" +#include "wine/list.h" #include "wine/debug.h" +#include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -typedef struct { - WCHAR lpzName[20]; - LONGLONG dwFreeSpace; - LONGLONG dwWantedSpace; -} DRIVE_ENTRY, *LPDRIVE_ENTRY; +struct file_entry +{ + struct list entry; + WCHAR *path; + UINT operation; + LONGLONG size; +}; + +struct space_list +{ + struct list files; + UINT flags; +}; -typedef struct { - DWORD dwDriveCount; - DRIVE_ENTRY Drives[26]; -} DISKSPACELIST, *LPDISKSPACELIST; /*********************************************************************** * SetupCreateDiskSpaceListW (SETUPAPI.@) */ -HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT Flags) +HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID reserved1, DWORD reserved2, UINT flags) { - WCHAR drives[255]; - DWORD rc; - WCHAR *ptr; - LPDISKSPACELIST list=NULL; + struct space_list *list; - TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags); + TRACE("(%p, %u, 0x%08x)\n", reserved1, reserved2, flags); - if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK) + if (reserved1 || reserved2 || flags & ~SPDSL_IGNORE_DISK) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - rc = GetLogicalDriveStringsW(255,drives); - - if (rc == 0) - return NULL; - - list = HeapAlloc(GetProcessHeap(),0,sizeof(DISKSPACELIST)); - - list->dwDriveCount = 0; - - ptr = drives; - - while (*ptr) + list = HeapAlloc(GetProcessHeap(), 0, sizeof(*list)); + if (list) { - DWORD type = GetDriveTypeW(ptr); - if (type == DRIVE_FIXED) - { - DWORD clusters; - DWORD sectors; - DWORD bytes; - DWORD total; - lstrcpyW(list->Drives[list->dwDriveCount].lpzName,ptr); - GetDiskFreeSpaceW(ptr,&sectors,&bytes,&clusters,&total); - list->Drives[list->dwDriveCount].dwFreeSpace = clusters * sectors * - bytes; - list->Drives[list->dwDriveCount].dwWantedSpace = 0; - list->dwDriveCount++; - } - ptr += lstrlenW(ptr) + 1; + list->flags = flags; + list_init(&list->files); } + return list; } @@ -105,32 +87,58 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListA(PVOID Reserved1, DWORD Reserved2, UINT /*********************************************************************** * SetupDuplicateDiskSpaceListW (SETUPAPI.@) */ -HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags) +HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC diskspace, PVOID reserved1, DWORD reserved2, UINT flags) { - DISKSPACELIST *list_copy, *list_original = DiskSpace; + struct space_list *list_copy, *list = diskspace; + struct file_entry *file, *file_copy; + + TRACE("(%p, %p, %u, %u)\n", diskspace, reserved1, reserved2, flags); - if (Reserved1 || Reserved2 || Flags) + if (reserved1 || reserved2 || flags) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (!DiskSpace) + if (!diskspace) { SetLastError(ERROR_INVALID_HANDLE); return NULL; } - list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(DISKSPACELIST)); + list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(*list_copy)); if (!list_copy) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - *list_copy = *list_original; + list_copy->flags = list->flags; + list_init(&list_copy->files); + + LIST_FOR_EACH_ENTRY(file, &list->files, struct file_entry, entry) + { + file_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(*file_copy)); + if (!file_copy) goto error; + + file_copy->path = strdupW(file->path); + if (!file_copy->path) + { + HeapFree(GetProcessHeap(), 0, file_copy); + goto error; + } + + file_copy->operation = file->operation; + file_copy->size = file->size; + list_add_head(&list_copy->files, &file->entry); + } return list_copy; + +error: + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetupDestroyDiskSpaceList(list_copy); + return NULL; } /*********************************************************************** @@ -155,55 +163,51 @@ BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, /*********************************************************************** * SetupQuerySpaceRequiredOnDriveW (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC DiskSpace, - LPCWSTR DriveSpec, LONGLONG *SpaceRequired, - PVOID Reserved1, UINT Reserved2) +BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC diskspace, + LPCWSTR drivespec, LONGLONG *required, + PVOID reserved1, UINT reserved2) { - WCHAR *driveW; - unsigned int i; - LPDISKSPACELIST list = DiskSpace; - BOOL rc = FALSE; - static const WCHAR bkslsh[]= {'\\',0}; + struct space_list *list = diskspace; + struct file_entry *file; + LONGLONG sum = 0; - if (!DiskSpace) + TRACE("(%p, %s, %p, %p, %u)\n", diskspace, debugstr_w(drivespec), required, reserved1, reserved2); + + if (!diskspace) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!DriveSpec) + if (!drivespec || !drivespec[0]) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(drivespec ? ERROR_INVALID_DRIVE : ERROR_INVALID_DRIVE); return FALSE; } - driveW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(DriveSpec) + 2) * sizeof(WCHAR)); - if (!driveW) + if (!required) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - lstrcpyW(driveW,DriveSpec); - lstrcatW(driveW,bkslsh); - - TRACE("Looking for drive %s\n",debugstr_w(driveW)); - - for (i = 0; i < list->dwDriveCount; i++) + if (towlower(drivespec[0]) < 'a' || towlower(drivespec[0]) > 'z' || + drivespec[1] != ':' || drivespec[2] != 0) { - TRACE("checking drive %s\n",debugstr_w(list->Drives[i].lpzName)); - if (wcscmp(driveW,list->Drives[i].lpzName)==0) - { - rc = TRUE; - *SpaceRequired = list->Drives[i].dwWantedSpace; - break; - } + FIXME("UNC paths not yet supported (%s)\n", debugstr_w(drivespec)); + SetLastError((GetVersion() & 0x80000000) ? ERROR_INVALID_DRIVE : ERROR_INVALID_PARAMETER); + return FALSE; } - HeapFree(GetProcessHeap(), 0, driveW); + LIST_FOR_EACH_ENTRY(file, &list->files, struct file_entry, entry) + { + if (towlower(file->path[0]) == towlower(drivespec[0]) && + file->path[1] == ':' && file->path[2] == '\\') + sum += file->size; + } - if (!rc) SetLastError(ERROR_INVALID_DRIVE); - return rc; + *required = sum; + return TRUE; } /*********************************************************************** @@ -253,10 +257,25 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, /*********************************************************************** * SetupDestroyDiskSpaceList (SETUPAPI.@) */ -BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) +BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC diskspace) { - LPDISKSPACELIST list = DiskSpace; - HeapFree(GetProcessHeap(),0,list); + struct space_list *list = diskspace; + struct file_entry *file, *file2; + + if (!diskspace) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE(file, file2, &list->files, struct file_entry, entry) + { + HeapFree(GetProcessHeap(), 0, file->path); + list_remove(&file->entry); + HeapFree(GetProcessHeap(), 0, file); + } + + HeapFree(GetProcessHeap(), 0, list); return TRUE; } -- 2.21.0

3 10

[PATCH v2] dpnet: Initialize size before call to RegGetValueW. (Coverity)
by Alistair Leslie-Hughes Oct. 20, 2019

Oct. 20, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/peer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index f935b2a313..7536af6796 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -157,6 +157,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) { @@ -198,6 +199,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) { -- 2.23.0

1 0

[PATCH v2] dplayx: Copy the correct Short name variable.
by Alistair Leslie-Hughes Oct. 20, 2019

Oct. 20, 2019

This appears to be a copy/paste bug. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dplayx/dplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e7d6edc6a0..e2464f8013 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2709,7 +2709,7 @@ static HRESULT DP_IF_GetGroupName( IDirectPlayImpl *This, DPID idGroup, void *lp if( lpGData->name.u1.lpszShortNameA ) { strcpy( ((char*)lpName)+lpGData->name.dwSize, - lpGData->name.u2.lpszLongNameA ); + lpGData->name.u1.lpszShortNameA ); } else { -- 2.23.0

1 0

[PATCH] dpnet: Initialize size before call to RegGetValueW. (Coverity)
by Alistair Leslie-Hughes Oct. 20, 2019

Oct. 20, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/peer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index f935b2a313..3df07749c5 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -157,6 +157,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) { -- 2.23.0

1 0