May 2018 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : mstask: Avoid an infinite loop in ITask::GetNextRunTime () if weekly trigger runs every week.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: aad4302998e7ed4fa906e7d66c6b6f8fa2ad6172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad4302998e7ed4fa906e7d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 23 15:47:55 2018 +0800 mstask: Avoid an infinite loop in ITask::GetNextRunTime() if weekly trigger runs every week. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 14705022..7a110b3 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -572,7 +572,7 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) } } - if (st.wDayOfWeek == 0) /* Sunday, goto next week */ + if (st.wDayOfWeek == 0 && This->trigger[i].Type.Weekly.WeeksInterval > 1) /* Sunday, goto next week */ filetime_add_weeks(&current_ft, This->trigger[i].Type.Weekly.WeeksInterval - 1); else /* check next weekday */ filetime_add_days(&current_ft, 1);

1 0

Louis Lenders : wmvcore: Add a fixme in WMProfileManager_QueryInterface if interface not found.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 737bbbecd7f70f545849f3de247631fe7ba2a19c URL: https://source.winehq.org/git/wine.git/?a=commit;h=737bbbecd7f70f545849f3de… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue May 22 15:44:08 2018 +0200 wmvcore: Add a fixme in WMProfileManager_QueryInterface if interface not found. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 1b45288..690885e 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -2133,6 +2133,7 @@ static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); *ppv = &This->IWMProfileManager_iface; }else { + FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

Nikolay Sivov : dwrite/tests: Remove a test failing after recent update.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: wine Branch: master Commit: 3493792da30bd5ce3531bc5168199c8f4efd7605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3493792da30bd5ce3531bc51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 08:24:37 2018 +0300 dwrite/tests: Remove a test failing after recent update. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f23bfcc..6c72319 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3233,12 +3233,7 @@ static void test_shared_isolated(void) ok(shared == shared2, "got %p, and %p\n", shared, shared2); IDWriteFactory_Release(shared2); - hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IUnknown, (IUnknown**)&shared2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(shared == shared2, "got %p, and %p\n", shared, shared2); - IDWriteFactory_Release(shared); - IDWriteFactory_Release(shared2); /* we got 2 references, released 2 - still same pointer is returned */ hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown**)&shared2);

1 0

Alexandre Julliard : vkd3d release 1.0
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: website Branch: master Commit: 55cb706c0fcba7e139e666b4921e11aef0fb3459 URL: https://source.winehq.org/git/website.git/?a=commit;h=55cb706c0fcba7e139e66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:26:10 2018 +0200 vkd3d release 1.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018052301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018052301.xml b/news/en/2018052301.xml new file mode 100644 index 0000000..3742db1 --- /dev/null +++ b/news/en/2018052301.xml @@ -0,0 +1,16 @@ +<news> +<date>May 23, 2018</date> +<title>Vkd3d 1.0 Released</title> +<body> +The Wine team is proud to announce that release 1.0 of vkd3d, the +Direct3D 12 to Vulkan translation library, is now available. + +This is the first release of vkd3d. A lot of Direct3D 12 features are still +missing and bugs are expected. The current version was tested mainly with demo +applications. A number of features that are being worked on have been deferred +to the next development cycle. This includes in particular geometry and +tessellation shaders support, various shader translation improvements, as well +as various improvements for core Direct3D 12 methods. + +The source is <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz">available here</a>. +</body></news>

1 0

Tag vkd3d-1.0 : Alexandre Julliard : Release 1.0
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: vkd3d Branch: refs/tags/vkd3d-1.0 Tag: 9e3814ff2bb8ceb2deaf65302bcf6548ac31febd URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=9e3814ff2bb8ceb2deaf65302b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:19:15 2018 +0200 Release 1.0

1 0

Józef Kucia : include: Force stack alignment on i386.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: vkd3d Branch: master Commit: d3c59c1a01e691934cc60a6dded5de87174d4225 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d3c59c1a01e691934cc60a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 12:14:47 2018 +0200 include: Force stack alignment on i386. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_windows.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 9cea6b4..ca7da53 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -168,7 +168,11 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; # ifdef __x86_64__ # define __stdcall __attribute__((ms_abi)) # else -# define __stdcall __attribute__((__stdcall__)) +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((__stdcall__)) +# endif # endif # define WINAPI __stdcall

1 0

Alexandre Julliard : Release 1.0.
by Alexandre Julliard May 23, 2018

May 23, 2018

Module: vkd3d Branch: master Commit: 020c119e2da0786d8be0615cff961c190b00d62d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=020c119e2da0786d8be0615… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:19:15 2018 +0200 Release 1.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE new file mode 100644 index 0000000..8c2c1de --- /dev/null +++ b/ANNOUNCE @@ -0,0 +1,90 @@ +The Wine team is proud to announce that release 1.0 of vkd3d, the +Direct3D 12 to Vulkan translation library, is now available. + +This is the first release of vkd3d. A lot of Direct3D 12 features are still +missing and bugs are expected. The current version was tested mainly with demo +applications. A number of features that are being worked on have been deferred +to the next development cycle. This includes in particular geometry and +tessellation shaders support, various shader translation improvements, as well +as various improvements for core Direct3D 12 methods. + +The source is available from the following location: + + https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz + +The current source can also be pulled directly from the git repository: + + https://source.winehq.org/git/vkd3d.git/ + +Vkd3d is available thanks to the work of multiple people. See the file AUTHORS +for the complete list. + +---------------------------------------------------------------- + +What's included in vkd3d 1.0 +============================ + + +*** libvkd3d + +- libvkd3d is the main component of the vkd3d project. It's a 3D graphics + library built on top of Vulkan with an API very similar to Direct3D 12. + +- A significant number of Direct3D 12 features are implemented, including: + - Graphics and compute pipelines. + - Command lists, command allocators and command queues. + - Descriptors and descriptor heaps. + - Root signatures. + - Constant buffer, shader resource, unordered access, render target and depth + stencil views. + - Samplers. + - Static samplers. + - Descriptors copying. + - Committed resources. + - Fences. + - Queries and query heaps. + - Resource barriers. + - Root constants. + - Basic support for indirect draws and dispatches. + - Basic support for command signatures. + - Various Clear*() methods. + - Various Copy*() methods. + + +*** libvkd3d-shader + +- libvkd3d-shader is a library which translates shader model 4 and 5 bytecode + to SPIR-V. In this release, libvkd3d-shader is an internal library. Its API + isn't set in stone yet. + +- Vertex, pixel and compute shaders are supported. Also, very simple geometry + shaders should be translated correctly. Issues are expected when trying to + translate tessellation shaders or more complex geometry shaders. + +- A significant number of shader instructions are supported in this release, + including: + - Arithmetic instructions. + - Bit instructions. + - Comparison instructions. + - Control flow instructions. + - Sample, gather and load instructions. + - Atomic instructions. + - UAV instructions. + +- Root signature serialization and deserialization is implemented. + +- Shader model 4 and 5 bytecode parser is imported from wined3d. + +- Shader model 5.1 is not supported yet. + + +*** libvkd3d-utils + +- libvkd3d-utils contains simple implementations of various functions which + might be useful for source ports of Direct3D 12 applications. + + +*** demos + +- A simple hello triangle Direct3D 12 demo. +- A Direct3D 12 port of glxgears. diff --git a/configure.ac b/configure.ac index 2b8249e..de4ece8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d], 0.0.1) +AC_INIT([vkd3d],[1.0]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4])

1 0

Zebediah Figura : msi/tests: Avoid calling MsiSetTargetPath("TARGETDIR").
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 30fe6f43612ce0a7d65ec16f751d3212cb78c1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=30fe6f43612ce0a7d65ec16f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 21:55:43 2018 -0500 msi/tests: Avoid calling MsiSetTargetPath("TARGETDIR"). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 9c9966c..08e4bbd 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -577,18 +577,18 @@ static void test_targetpath(MSIHANDLE hinst) r = MsiSetTargetPathA(hinst, NULL, "C:\\subdir"); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - r = MsiSetTargetPathA(hinst, "TARGETDIR", NULL); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", NULL); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - r = MsiSetTargetPathA(hinst, "TARGETDIR", "C:\\subdir"); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", "C:\\subdir"); ok(hinst, !r, "got %u\n", r); sz = sizeof(buffer); - r = MsiGetTargetPathA(hinst, "TARGETDIR", buffer, &sz); + r = MsiGetTargetPathA(hinst, "MSITESTDIR", buffer, &sz); ok(hinst, !r, "got %u\n", r); ok(hinst, !strcmp(buffer, "C:\\subdir\\"), "got \"%s\"\n", buffer); - r = MsiSetTargetPathA(hinst, "TARGETDIR", "C:\\"); + r = MsiSetTargetPathA(hinst, "MSITESTDIR", "C:\\"); /* test GetSourcePath() */

1 0

Nikolay Sivov : dwrite: Properly truncate face name to LOGFONT size.
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: e5966d747543ebe2bc4270c424f16f50e9972524 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5966d747543ebe2bc4270c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 22 11:50:43 2018 +0300 dwrite: Properly truncate face name to LOGFONT size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 15 +++++++++++++-- dlls/dwrite/tests/font.c | 9 +++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b95083e..db44368 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1736,8 +1736,19 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * if (!exists) IDWriteLocalizedStrings_FindLocaleName(lfnames, enusW, &index, &exists); - if (exists) - IDWriteLocalizedStrings_GetString(lfnames, index, lfname, LF_FACESIZE); + if (exists) { + UINT32 length = 0; + WCHAR *nameW; + + IDWriteLocalizedStrings_GetStringLength(lfnames, index, &length); + nameW = heap_alloc((length + 1) * sizeof(WCHAR)); + if (nameW) { + *nameW = 0; + IDWriteLocalizedStrings_GetString(lfnames, index, nameW, length + 1); + lstrcpynW(lfname, nameW, LF_FACESIZE); + heap_free(nameW); + } + } IDWriteLocalizedStrings_Release(lfnames); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index db9949f..f23bfcc 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2515,6 +2515,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) if (exists) { static const WCHAR enusW[] = {'e','n','-','u','s',0}; WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; + WCHAR nameW[256]; UINT32 index; /* Fallback to en-us if there's no string for user locale. */ @@ -2525,8 +2526,12 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) if (!exists) IDWriteLocalizedStrings_FindLocaleName(names, enusW, &index, &exists); - if (exists) - IDWriteLocalizedStrings_GetString(names, index, logfont->lfFaceName, ARRAY_SIZE(logfont->lfFaceName)); + if (exists) { + nameW[0] = 0; + hr = IDWriteLocalizedStrings_GetString(names, index, nameW, ARRAY_SIZE(nameW)); + ok(hr == S_OK, "Failed to get name string, hr %#x.\n", hr); + lstrcpynW(logfont->lfFaceName, nameW, ARRAY_SIZE(logfont->lfFaceName)); + } } IDWriteLocalizedStrings_Release(names);

1 0

Zebediah Figura : odbccp32: Clean up SQLGetInstalledDrivers().
by Alexandre Julliard May 22, 2018

May 22, 2018

Module: wine Branch: master Commit: 169960b676e6b6a36f8a69a626072f3f5a846bd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=169960b676e6b6a36f8a69a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:55 2018 -0500 odbccp32: Clean up SQLGetInstalledDrivers(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 138 +++++++++++++++++++++++------------------------ 1 file changed, 68 insertions(+), 70 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index f9a2269..8788330 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -482,99 +482,97 @@ BOOL WINAPI SQLGetConfigMode(UWORD *pwConfigMode) return TRUE; } -/* This is implemented sensibly rather than according to exact conformance to Microsoft's buggy implementations - * e.g. The Microsoft one occasionally actually adds a third nul character (possibly beyond the buffer). - * e.g. If the key has no drivers then version 3.525.1117.0 does not modify the buffer at all, not even a nul character. - */ -BOOL WINAPI SQLGetInstalledDriversW(LPWSTR lpszBuf, WORD cbBufMax, - WORD *pcbBufOut) +BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout) { - HKEY hDrivers; /* Registry handle to the Drivers key */ - LONG reg_ret; /* Return code from registry functions */ - BOOL success = FALSE; /* The value we will return */ + WORD written = 0; + DWORD index = 0; + BOOL ret = TRUE; + DWORD valuelen; + WCHAR *value; + HKEY drivers; + DWORD len; + LONG res; clear_errors(); - TRACE("%p %d %p\n", lpszBuf, cbBufMax, pcbBufOut); + TRACE("%p %d %p\n", buf, size, sizeout); - if (!lpszBuf || cbBufMax == 0) + if (!buf || !size) { push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len); + return FALSE; } - else if ((reg_ret = RegOpenKeyExW (HKEY_LOCAL_MACHINE /* The drivers does not depend on the config mode */, - drivers_key, 0, KEY_READ /* Maybe overkill */, - &hDrivers)) == ERROR_SUCCESS) + + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drivers_key, 0, KEY_QUERY_VALUE, &drivers); + if (res) { - DWORD index = 0; - cbBufMax--; - success = TRUE; - while (cbBufMax > 0) - { - DWORD size_name; - size_name = cbBufMax; - if ((reg_ret = RegEnumValueW(hDrivers, index, lpszBuf, &size_name, NULL, NULL, NULL, NULL)) == ERROR_SUCCESS) - { - index++; - assert (size_name < cbBufMax && *(lpszBuf + size_name) == 0); - size_name++; - cbBufMax-= size_name; - lpszBuf+=size_name; - } - else - { - if (reg_ret != ERROR_NO_MORE_ITEMS) - { - success = FALSE; - push_error(ODBC_ERROR_GENERAL_ERR, odbc_error_general_err); - } - break; - } - } - *lpszBuf = 0; - if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) - TRACE ("Error %d closing ODBC Drivers key\n", reg_ret); + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + return FALSE; } - else + + RegQueryInfoKeyW(drivers, 0, 0, 0, 0, 0, 0, 0, &valuelen, 0, 0, 0); + value = heap_alloc(++valuelen * sizeof(WCHAR)); + + size--; + + while (1) { - /* MSDN states that it returns failure with COMPONENT_NOT_FOUND in this case. - * Version 3.525.1117.0 (Windows 2000) does not; it actually returns success. - * I doubt if it will actually be an issue. - */ - push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + len = valuelen; + res = RegEnumValueW(drivers, index++, value, &len, NULL, NULL, NULL, NULL); + if (res == ERROR_SUCCESS) + { + lstrcpynW(buf + written, value, size - written); + written += min(len + 1, size - written); + } + else if (res == ERROR_NO_MORE_ITEMS) + break; + else + { + push_error(ODBC_ERROR_GENERAL_ERR, odbc_error_general_err); + ret = FALSE; + break; + } } - return success; + + buf[written++] = 0; + + heap_free(value); + RegCloseKey(drivers); + if (sizeout) + *sizeout = written; + return ret; } -BOOL WINAPI SQLGetInstalledDrivers(LPSTR lpszBuf, WORD cbBufMax, - WORD *pcbBufOut) +BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) { + WORD written; + WCHAR *wbuf; BOOL ret; - int size_wbuf = cbBufMax; - LPWSTR wbuf; - WORD size_used; - TRACE("%p %d %p\n", lpszBuf, cbBufMax, pcbBufOut); + TRACE("%p %d %p\n", buf, size, sizeout); - wbuf = HeapAlloc(GetProcessHeap(), 0, size_wbuf*sizeof(WCHAR)); - if (wbuf) + if (!buf || !size) { - ret = SQLGetInstalledDriversW(wbuf, size_wbuf, &size_used); - if (ret) - { - if (!(ret = SQLInstall_narrow(2, lpszBuf, wbuf, size_used, cbBufMax, pcbBufOut))) - { - push_error(ODBC_ERROR_GENERAL_ERR, odbc_error_general_err); - } - } - HeapFree(GetProcessHeap(), 0, wbuf); - /* ignore failure; we have achieved the aim */ + push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len); + return FALSE; } - else + + wbuf = heap_alloc(size * sizeof(WCHAR)); + if (!wbuf) { push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); - ret = FALSE; + return FALSE; } - return ret; + + ret = SQLGetInstalledDriversW(wbuf, size, &written); + if (!ret) + return FALSE; + + *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL); + + heap_free(wbuf); + return TRUE; } static HKEY get_privateprofile_sectionkey(LPCWSTR section, LPCWSTR filename)

1 0