November 2020 - Wine-Devel - list.winehq.org

[PATCH v2 1/7] gdi32/tests: Fix a compiler warning.
by Sven Baars Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- ../dlls/gdi32/tests/font.c:1361:19: warning: ‘code’ may be used uninitialized in this function [-Wmaybe-uninitialized] 1361 | ret = GetCharABCWidthsA(hdc, code, code, abc); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ dlls/gdi32/tests/font.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4c8b1cbb91b..d3ec971dce0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1330,17 +1330,16 @@ static void test_GetCharABCWidths(void) memset(&lf, 0, sizeof(lf)); lf.lfHeight = 20; - switch(i) + if (i == 1) { - case 1: strcpy(lf.lfFaceName, "Tahoma"); code = 'a'; - break; - case 2: + } + else + { strcpy(lf.lfFaceName, "Times New Roman"); lf.lfItalic = TRUE; code = 'f'; - break; } if (!is_truetype_font_installed(lf.lfFaceName)) { -- 2.25.1

2 12

[PATCH v2] gdi32: Avoid visrect that exceed the actual bitmap size.
by Haoyang Chen Nov. 12, 2020

Nov. 12, 2020

2 1

[PATCH v3] gdi32: Avoid exceeding the actual bitmap height.
by Huw Davies Nov. 12, 2020

Nov. 12, 2020

From: Haoyang Chen <chenhaoyang(a)uniontech.com> The bottom-up case is handled earlier on. For the top-down case, 'lines' is left untouched. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 10a7a957973..790ecf06501 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -824,7 +824,7 @@ INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx } else if (src.y >= lines) return lines; } - src_info->bmiHeader.biHeight = top_down ? -lines : lines; + src_info->bmiHeader.biHeight = top_down ? -min( lines, height ) : lines; src_info->bmiHeader.biSizeImage = get_dib_image_size( src_info ); } -- 2.23.0

1 0

[PATCH 1/5] evr/allocator: Fix released sample pointer check.
by Nikolay Sivov Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/sample.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index a44e3ef45c6..e84d7450c7f 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -796,15 +796,23 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback { struct sample_allocator *allocator = impl_from_IMFAsyncCallback(iface); struct queued_sample *iter; - IUnknown *sample = NULL; + IUnknown *object = NULL; + IMFSample *sample = NULL; + HRESULT hr; - EnterCriticalSection(&allocator->cs); + if (FAILED(IMFAsyncResult_GetObject(result, &object))) + return E_UNEXPECTED; - IMFAsyncResult_GetObject(result, (IUnknown **)&sample); + hr = IUnknown_QueryInterface(object, &IID_IMFSample, (void **)&sample); + IUnknown_Release(object); + if (FAILED(hr)) + return E_UNEXPECTED; + + EnterCriticalSection(&allocator->cs); LIST_FOR_EACH_ENTRY(iter, &allocator->used_samples, struct queued_sample, entry) { - if (sample == (IUnknown *)iter->sample) + if (sample == iter->sample) { list_remove(&iter->entry); list_add_tail(&allocator->free_samples, &iter->entry); @@ -813,7 +821,7 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback } } - IUnknown_Release(sample); + IMFSample_Release(sample); if (allocator->callback) IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback); -- 2.28.0

1 4

[PATCH] odbccp32: Only pass supported values to ConfigDSN functions
by Alistair Leslie-Hughes Nov. 12, 2020

Nov. 12, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50116 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index c842872fa6e..57e2b3ec55f 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -338,6 +338,23 @@ fail: return FALSE; } +static WORD fixup_config_request(WORD request) +{ + switch(request) + { + case ODBC_ADD_SYS_DSN: + return ODBC_ADD_DSN; + case ODBC_CONFIG_SYS_DSN: + return ODBC_CONFIG_DSN; + case ODBC_REMOVE_SYS_DSN: + return ODBC_REMOVE_DSN; + case ODBC_REMOVE_DEFAULT_DSN: + FIXME("ODBC_REMOVE_DEFAULT_DSN currently not handled\n"); + } + + return request; +} + BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) { HMODULE mod; @@ -357,6 +374,8 @@ BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWST if (!mod) return FALSE; + request = fixup_config_request(request); + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); if(pConfigDSNW) ret = pConfigDSNW(hwnd, request, driver, attributes); @@ -402,6 +421,8 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a return FALSE; } + request = fixup_config_request(request); + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); if (pConfigDSN) { -- 2.28.0

2 1

[PATCH v2 1/3] bcrypt: Prevent gnutls from using system priority file.
by Paul Gofman Nov. 12, 2020

Nov. 12, 2020

Fedora 33 disabled protocols below TLS 1.2 through crypto policy [1]. https://fedoraproject.org/wiki/Changes/StrongCryptoSettings2#Strong_crypto_… Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - print warning. dlls/bcrypt/gnutls.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index e85085499ca..41df88ca8f6 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -222,8 +222,19 @@ static void gnutls_log( int level, const char *msg ) static BOOL gnutls_initialize(void) { + const char *env_str; int ret; + if ((env_str = getenv("GNUTLS_SYSTEM_PRIORITY_FILE"))) + { + WARN("GNUTLS_SYSTEM_PRIORITY_FILE is %s.\n", debugstr_a(env_str)); + } + else + { + WARN("Setting GNUTLS_SYSTEM_PRIORITY_FILE to \"/dev/null\".\n"); + setenv("GNUTLS_SYSTEM_PRIORITY_FILE", "/dev/null", 0); + } + if (!(libgnutls_handle = dlopen( SONAME_LIBGNUTLS, RTLD_NOW ))) { ERR_(winediag)( "failed to load libgnutls, no support for encryption\n" ); -- 2.28.0

3 4

[PATCH v2 3/3] crypt32: Add support for CMSG_ENCODED_MESSAGE for a being decoded signed message.
by Dmitry Timoshkov Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ba3690b264..fac9561bbb 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3151,6 +3151,12 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_ENCODED_MESSAGE: + if (msg->msg_data.pbData) + ret = CRYPT_CopyParam(pvData, pcbData, msg->msg_data.pbData, msg->msg_data.cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_ENCODED_SIGNER: if (msg->u.signed_data.info) { -- 2.29.2

1 0

[PATCH v2 2/3] crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM for a being decoded signed message.
by Dmitry Timoshkov Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 88c27a1c66..ba3690b264 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3194,6 +3194,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_SIGNER_AUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex].AuthAttrs); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_SIGNER_UNAUTH_ATTR_PARAM: if (msg->u.signed_data.info) { -- 2.29.2

1 0

[PATCH v2 1/3] crypt32: Make helper for copying CMSG_CMS_SIGNER_INFO attributes more generic.
by Dmitry Timoshkov Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b71c52bb0f..88c27a1c66 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2995,15 +2995,14 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } -static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, - const CMSG_CMS_SIGNER_INFO *in) +static BOOL CRYPT_CopyAttr(void *pvData, DWORD *pcbData, const CRYPT_ATTRIBUTES *attr) { DWORD size; BOOL ret; - TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, attr); - size = CRYPT_SizeOfAttributes(&in->UnauthAttrs); + size = CRYPT_SizeOfAttributes(attr); if (!pvData) { *pcbData = size; @@ -3016,12 +3015,8 @@ static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, ret = FALSE; } else - { - CRYPT_ATTRIBUTES *out = pvData; + ret = CRYPT_ConstructAttributes(pvData, attr); - CRYPT_ConstructAttributes(out,&in->UnauthAttrs); - ret = TRUE; - } TRACE("returning %d\n", ret); return ret; } @@ -3205,8 +3200,8 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, if (dwIndex >= msg->u.signed_data.info->cSignerInfo) SetLastError(CRYPT_E_INVALID_INDEX); else - ret = CRYPT_CopyUnauthAttr(pvData, pcbData, - &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + ret = CRYPT_CopyAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex].UnauthAttrs); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE); -- 2.29.2

1 0

[PATCH] oledb32: Use wide-char string literals.
by Nikolay Sivov Nov. 12, 2020

Nov. 12, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This also fixes typos in DBPROP_AUTH_CACHE_AUTHINFO and DBPROP_INIT_OLEDBSERVICES descriptions. dlls/oledb32/convert.c | 18 ++---- dlls/oledb32/datainit.c | 127 ++++++++++++++------------------------- dlls/oledb32/dslocator.c | 3 +- 3 files changed, 51 insertions(+), 97 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 2fc65c74031..81483dc0a09 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -670,11 +670,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, { WCHAR szBuff[39]; const GUID *id = src; - static const WCHAR format[] = { - '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', - '%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - wsprintfW(szBuff, format, + wsprintfW(szBuff, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); @@ -705,18 +701,14 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_DBTIMESTAMP: { WCHAR szBuff[64]; - static const WCHAR format1[] = { - '%','0','4','d','-','%','0','2','d','-','%','0','2','d',' ','%','0','2','d',':','%','0','2','d', - ':','%','0','2','d', 0}; - static const WCHAR format2[] = { - '%','0','4','d','-','%','0','2','d','-','%','0','2','d',' ','%','0','2','d',':','%','0','2','d', - ':','%','0','2','d','.','%','0','9','d', 0}; DBTIMESTAMP *ts = src; if(ts->fraction == 0) - wsprintfW(szBuff, format1, ts->year, ts->month, ts->day, ts->hour, ts->minute, ts->second); + wsprintfW(szBuff, L"%04d-%02d-%02d %02d:%02d:%02d", ts->year, ts->month, ts->day, ts->hour, + ts->minute, ts->second); else - wsprintfW(szBuff, format2, ts->year, ts->month, ts->day, ts->hour, ts->minute, ts->second, ts->fraction ); + wsprintfW(szBuff, L"%04d-%02d-%02d %02d:%02d:%02d.%09d", ts->year, ts->month, ts->day, ts->hour, + ts->minute, ts->second, ts->fraction ); *d = SysAllocString(szBuff); hr = *d ? S_OK : E_OUTOFMEMORY; break; diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 130fb626ea1..ec26d0a11ee 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -326,23 +326,15 @@ static int __cdecl dbmodeprop_compare(const void *a, const void *b) static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) { - static const WCHAR readW[] = {'R','e','a','d',0}; - static const WCHAR readwriteW[] = {'R','e','a','d','W','r','i','t','e',0}; - static const WCHAR sharedenynoneW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','N','o','n','e',0}; - static const WCHAR sharedenyreadW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','R','e','a','d',0}; - static const WCHAR sharedenywriteW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','W','r','i','t','e',0}; - static const WCHAR shareexclusiveW[] = {'S','h','a','r','e',' ','E','x','c','l','u','s','i','v','e',0}; - static const WCHAR writeW[] = {'W','r','i','t','e',0}; - - struct mode_propval mode_propvals[] = + static const struct mode_propval mode_propvals[] = { - { readW, DB_MODE_READ }, - { readwriteW, DB_MODE_READWRITE }, - { sharedenynoneW, DB_MODE_SHARE_DENY_NONE }, - { sharedenyreadW, DB_MODE_SHARE_DENY_READ }, - { sharedenywriteW, DB_MODE_SHARE_DENY_WRITE }, - { shareexclusiveW, DB_MODE_SHARE_EXCLUSIVE }, - { writeW, DB_MODE_WRITE }, + { L"Read", DB_MODE_READ }, + { L"ReadWrite", DB_MODE_READWRITE }, + { L"Share Deny None", DB_MODE_SHARE_DENY_NONE }, + { L"Share Deny Read", DB_MODE_SHARE_DENY_READ }, + { L"Share Deny Write", DB_MODE_SHARE_DENY_WRITE }, + { L"Share Exclusive", DB_MODE_SHARE_EXCLUSIVE }, + { L"Write", DB_MODE_WRITE }, }; struct mode_propval *prop; @@ -358,59 +350,35 @@ static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) return E_FAIL; } -static const WCHAR asyncW[] = {'A','s','y','n','c','h','r','o','n','o','u','s',' ','P','r','o','c','e','s','s','i','n','g',0}; -static const WCHAR bindW[] = {'B','i','n','d',' ','F','l','a','g','s',0}; -static const WCHAR cacheW[] = {'C','a','c','h','e',' ','A','u','t','h','e','n','i','c','a','t','i','o','n',0}; -static const WCHAR conn_timeout[] = {'C','o','n','n','e','c','t',' ','T','i','m','e','o','u','t',0}; -static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; -static const WCHAR encryptW[] = {'E','n','c','r','y','p','t',' ','P','a','s','s','w','o','r','d',0}; -static const WCHAR extendedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; -static const WCHAR gen_timeout[] = {'G','e','n','e','r','a','l',' ','T','i','m','e','o','u','t',0}; -static const WCHAR impersonW[] = {'I','m','p','e','r','s','o','n','a','t','i','o','n',' ','L','e','v','e','l',0}; -static const WCHAR initcatW[] = {'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g',0}; -static const WCHAR integratedW[] = {'I','n','t','e','g','r','a','t','e','d',' ','S','e','c','u','r','i','t','y',0}; -static const WCHAR localeIDW[] = {'L','o','c','a','l','e',' ','I','d','e','n','t','i','f','i','e','r',0}; -static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; -static const WCHAR lockownerW[] = {'L','o','c','k',' ','O','w','n','e','r',0}; -static const WCHAR maskpassW[] = {'M','a','s','k',' ','P','a','s','s','w','o','r','d',0}; -static const WCHAR modeW[] = {'M','o','d','e',0}; -static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0}; -static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0}; -static const WCHAR persistW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; -static const WCHAR persistEncW[] = {'P','e','r','s','i','s','t',' ','E','n','c','r','y','p','t','e','d',0}; -static const WCHAR promptW[] = {'P','r','o','m','p','t',0}; -static const WCHAR protectW[] = {'P','r','o','t','e','c','t','i','o','n',' ','l','e','v','e','l',0}; -static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0}; -static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0}; - -static const struct dbproperty dbproperties[] = { - { asyncW, DBPROP_INIT_ASYNCH, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { bindW, DBPROP_INIT_BINDFLAGS, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { cacheW, DBPROP_AUTH_CACHE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, - { conn_timeout,DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, - { extendedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, - { encryptW, DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROPOPTIONS_REQUIRED, VT_BOOL }, - { gen_timeout, DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { impersonW, DBPROP_INIT_IMPERSONATION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { initcatW, DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, - { integratedW, DBPROP_AUTH_INTEGRATED, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, - { localeIDW, DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { locationW, DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, - { lockownerW, DBPROP_INIT_LOCKOWNER, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, - { maskpassW, DBPROP_AUTH_MASK_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, - { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, - { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, - { persistEncW, DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, - { persistW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, - { promptW, DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, - { protectW, DBPROP_INIT_PROTECTION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { useridW, DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, +static const struct dbproperty dbproperties[] = +{ + { L"Asynchronous Processing", DBPROP_INIT_ASYNCH, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Bind Flags", DBPROP_INIT_BINDFLAGS, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Cache Authentication", DBPROP_AUTH_CACHE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"Connect Timeout", DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Data Source", DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Extended Properties", DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { L"Encrypt Password", DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROPOPTIONS_REQUIRED, VT_BOOL }, + { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Impersonation Level", DBPROP_INIT_IMPERSONATION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Initial Catalog", DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Integrated Security", DBPROP_AUTH_INTEGRATED, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Locale Identifier", DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Location", DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Lock Owner", DBPROP_INIT_LOCKOWNER, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Mask Password", DBPROP_AUTH_MASK_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"Mode", DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, + { L"OLE DB Services", DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Password", DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Persist Encrypted", DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"Persist Security Info", DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { L"Prompt", DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { L"Protection level", DBPROP_INIT_PROTECTION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"User ID", DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, #ifndef _WIN64 - { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, #else - { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I8 }, + { L"Window Handle", DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I8 }, #endif }; @@ -467,7 +435,6 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) start = initstring; while (start && (eq = wcschr(start, '='))) { - static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; WCHAR *delim, quote; BSTR value, name; @@ -500,7 +467,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) } start = delim; - if (!wcsicmp(name, providerW)) + if (!wcsicmp(name, L"Provider")) { SysFreeString(name); SysFreeString(value); @@ -576,7 +543,6 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr if (!descr) { - static const WCHAR eqW[] = {'=',0}; BSTR str; int len; @@ -584,7 +550,7 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr len = SysStringLen(pair->name) + SysStringLen(pair->value) + 1 /* for '=' */; str = SysAllocStringLen(NULL, len); lstrcpyW(str, pair->name); - lstrcatW(str, eqW); + lstrcatW(str, L"="); lstrcatW(str, pair->value); (*propset)->cProperties++; @@ -663,8 +629,7 @@ static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub) HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) { - static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r','=',0}; - static const WCHAR msdasqlW[] = {'M','S','D','A','S','Q','L',0}; + static const WCHAR providerW[] = L"Provider="; BOOL datasource_created = FALSE; IDBProperties *dbprops; DBPROPSET *propset; @@ -703,7 +668,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID } else { - hr = CLSIDFromProgID(msdasqlW, &provclsid); + hr = CLSIDFromProgID(L"MSDASQL", &provclsid); if (FAILED(hr)) ERR("ODBC provider for OLE DB not registered\n"); } @@ -879,8 +844,7 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *datasource, boolean include_pass, LPWSTR *init_string) { - static const WCHAR provW[] = {'P','r','o','v','i','d','e','r','=',0}; - static const WCHAR colW[] = {';',0}; + static const WCHAR providerW[] = L"Provider="; datainit *This = impl_from_IDataInitialize(iface); DBPROPINFOSET *propinfoset; IDBProperties *props; @@ -935,7 +899,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I IDBProperties_Release(props); /* check if we need to skip password */ - len = lstrlenW(progid) + lstrlenW(provW) + 1; /* including ';' */ + len = lstrlenW(progid) + lstrlenW(providerW) + 1; /* including ';' */ for (i = 0; i < count; i++) { WCHAR *descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); @@ -956,9 +920,9 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I *init_string[0] = 0; /* provider name */ - lstrcatW(*init_string, provW); + lstrcatW(*init_string, providerW); lstrcatW(*init_string, progid); - lstrcatW(*init_string, colW); + lstrcatW(*init_string, L";"); CoTaskMemFree(progid); for (i = 0; i < count; i++) @@ -970,11 +934,10 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); if (descr) { - static const WCHAR eqW[] = {'=',0}; lstrcatW(*init_string, descr); - lstrcatW(*init_string, eqW); + lstrcatW(*init_string, L"="); write_propvalue_str(*init_string, &propset->rgProperties[i]); - lstrcatW(*init_string, colW); + lstrcatW(*init_string, L";"); } } diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 86a334bea0e..c74fb5133d2 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -277,7 +277,6 @@ static void create_connections_columns(HWND lv) static void add_connections_providers(HWND lv) { - static const WCHAR oledbprov[] = {'\\','O','L','E',' ','D','B',' ','P','r','o','v','i','d','e','r',0}; LONG res; HKEY key = NULL, subkey; DWORD index = 0; @@ -296,7 +295,7 @@ static void add_connections_providers(HWND lv) WCHAR description[MAX_PATH]; lstrcpyW(guidkey, provider); - lstrcatW(guidkey, oledbprov); + lstrcatW(guidkey, L"\\OLE DB Provider"); res = RegOpenKeyW(key, guidkey, &subkey); if (res == ERROR_SUCCESS) -- 2.28.0

1 0