March 2020 - Wine-commits - list.winehq.org

Dmitry Timoshkov : adsldp: Map 1.3.6.1.4.1.1466.115.121.1.7 to ADSTYPE_BOOLEAN.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 7f988091733286ffd9af3f0906a21f144f7bc885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f988091733286ffd9af3f09… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:58:01 2020 +0800 adsldp: Map 1.3.6.1.4.1.1466.115.121.1.7 to ADSTYPE_BOOLEAN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 13 +++++++++++++ dlls/adsldp/schema.c | 2 ++ 2 files changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index e27e641eb0..8fe7bfd18c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1349,6 +1349,19 @@ static HRESULT add_column_values(LDAP_namespace *ldap, ADS_SEARCH_COLUMN *col, break; } + case ADSTYPE_BOOLEAN: + if (stricmp(values[i]->bv_val, "TRUE")) + col->pADsValues[i].u.Boolean = 1; + else if (stricmp(values[i]->bv_val, "FALSE")) + col->pADsValues[i].u.Boolean = 0; + else + { + FIXME("not recognized boolean value %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); + col->pADsValues[i].u.Boolean = 0; + } + TRACE("=> %d\n", col->pADsValues[i].u.Boolean); + break; + case ADSTYPE_INTEGER: col->pADsValues[i].u.Integer = strtol(values[i]->bv_val, NULL, 10); TRACE("%s => %d\n", debugstr_an(values[i]->bv_val, values[i]->bv_len), col->pADsValues[i].u.Integer); diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 234a76dfa9..bff754be7a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -58,6 +58,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, type = find_schema_type(name, at, at_count); if (!type || !type->syntax) return ADSTYPE_CASE_IGNORE_STRING; + if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.7")) + return ADSTYPE_BOOLEAN; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.12")) return ADSTYPE_DN_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.15"))

1 0

Dmitry Timoshkov : adsldp: Implement IDirectorySearch::FreeColumn().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 21959bf00a40c2daed3c47078d0181f17f2d3c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21959bf00a40c2daed3c4707… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:58:04 2020 +0800 adsldp: Implement IDirectorySearch::FreeColumn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 9 +++++++-- dlls/adsldp/tests/ldap.c | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 8fe7bfd18c..61162f08a3 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1446,8 +1446,13 @@ exit: static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COLUMN col) { - FIXME("%p,%p: stub\n", iface, col); - return E_NOTIMPL; + TRACE("%p,%p\n", iface, col); + + if (!col) return E_ADS_BAD_PARAMETER; + + heap_free(col->pADsValues); + + return S_OK; } static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index bd22be8e61..3abbbdadb0 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -386,7 +386,6 @@ todo_wine } hr = IDirectorySearch_FreeColumn(ds, &col); -todo_wine ok(hr == S_OK, "got %#x\n", hr); }

1 0

Dmitry Timoshkov : adsldp: Fix IDirectorySearch::GetColumn() behaviour for not found case.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 57f3d503c42138a41cfd2b7ba69cb2369faf9c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57f3d503c42138a41cfd2b7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:58:06 2020 +0800 adsldp: Fix IDirectorySearch::GetColumn() behaviour for not found case. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 6 +++++- dlls/adsldp/tests/ldap.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 61162f08a3..5ab7948b1f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1434,7 +1434,11 @@ exit: } values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); - if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE; + if (!values) + { + memset(col, 0, sizeof(*col)); + return E_ADS_COLUMN_NOT_SET; + } count = ldap_count_values_len(values); diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 3abbbdadb0..aec5bf89ee 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -417,6 +417,18 @@ todo_wine ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); } + hr = IDirectorySearch_GetFirstRow(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&col, 0x55, sizeof(col)); + hr = IDirectorySearch_GetColumn(ds, sh, (WCHAR *)L"deadbeef", &col); + ok(hr == E_ADS_COLUMN_NOT_SET, "got %#x\n", hr); + ok(!col.pszAttrName, "got %p\n", col.pszAttrName); + ok(col.dwADsType == ADSTYPE_INVALID || broken(col.dwADsType != ADSTYPE_INVALID) /* XP */, "got %d\n", col.dwADsType); + ok(!col.pADsValues, "got %p\n", col.pADsValues); + ok(!col.dwNumValues, "got %u\n", col.dwNumValues); + ok(!col.hReserved, "got %p\n", col.hReserved); + hr = IDirectorySearch_CloseSearchHandle(ds, sh); ok(hr == S_OK, "got %#x\n", hr);

1 0

Dmitry Timoshkov : adsldp/tests: Handle more cases of ERROR_DS_SERVER_DOWN.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: efe7c309cdec2f5ab0bb5985ad980fe64da400bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe7c309cdec2f5ab0bb5985… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:58:12 2020 +0800 adsldp/tests: Handle more cases of ERROR_DS_SERVER_DOWN. Probably server protects itself from quick successive connections from the same client and returns LDAP_SERVER_DOWN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/ldap.c | 2 +- dlls/adsldp/tests/ldap.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/ldap.c b/dlls/adsldp/ldap.c index c23f46267e..37a990ad81 100644 --- a/dlls/adsldp/ldap.c +++ b/dlls/adsldp/ldap.c @@ -69,7 +69,7 @@ DWORD map_ldap_error(DWORD err) case LDAP_NO_OBJECT_CLASS_MODS: return ERROR_DS_CANT_MOD_OBJ_CLASS; case LDAP_RESULTS_TOO_LARGE: return ERROR_DS_OBJECT_RESULTS_TOO_LARGE; case LDAP_AFFECTS_MULTIPLE_DSAS: return ERROR_DS_AFFECTS_MULTIPLE_DSAS; - case LDAP_SERVER_DOWN: return ERROR_DS_SERVER_DOWN; + case LDAP_SERVER_DOWN: return ERROR_DS_SERVER_DOWN; case LDAP_LOCAL_ERROR: return ERROR_DS_LOCAL_ERROR; case LDAP_ENCODING_ERROR: return ERROR_DS_ENCODING_ERROR; case LDAP_DECODING_ERROR: return ERROR_DS_DECODING_ERROR; diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index aec5bf89ee..b3cb489d58 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -106,11 +106,23 @@ static void test_LDAP(void) IDispatch_Release(disp); hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + SysFreeString(path); + skip("server is down\n"); + break; + } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) IADs_Release(ads); hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + SysFreeString(path); + skip("server is down\n"); + break; + } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) IDispatch_Release(disp); @@ -337,8 +349,12 @@ todo_wine ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = ADsGetObject(L"LDAP://ldap.forumsys.com", &IID_IDirectorySearch, (void **)&ds); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } ok(hr == S_OK, "got %#x\n", hr); - if (hr != S_OK) return; pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; pref.vValue.dwType = ADSTYPE_INTEGER;

1 0

Alexandre Julliard : ntdll: Avoid using tolowerW().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 7a974814cda795801fb845887508e85edaa67df6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a974814cda795801fb84588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:09:15 2020 +0200 ntdll: Avoid using tolowerW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 31 +++++++++++++------------------ dlls/ntdll/loader.c | 13 +++++++------ dlls/ntdll/locale.c | 4 +++- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cb9ce3740e..80777da149 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1316,8 +1316,8 @@ static ULONG hash_short_file_name( const UNICODE_STRING *name, LPWSTR buffer ) if (!is_case_sensitive) { for (p = name->Buffer, hash = 0xbeef; p < end - 1; p++) - hash = (hash<<3) ^ (hash>>5) ^ tolowerW(*p) ^ (tolowerW(p[1]) << 8); - hash = (hash<<3) ^ (hash>>5) ^ tolowerW(*p); /* Last character */ + hash = (hash<<3) ^ (hash>>5) ^ RtlDowncaseUnicodeChar(*p) ^ (RtlDowncaseUnicodeChar(p[1]) << 8); + hash = (hash<<3) ^ (hash>>5) ^ RtlDowncaseUnicodeChar(*p); /* Last character */ } else { @@ -2245,29 +2245,24 @@ static int match_redirect( const WCHAR *path, int len, const WCHAR *redir, BOOLE { int i = 0; - while (i < len && *redir) + while (i < len) { - if (IS_SEPARATOR(path[i])) + int start = i; + while (i < len && !IS_SEPARATOR(path[i])) i++; + if (check_case) { - if (*redir++ != '\\') return 0; - while (i < len && IS_SEPARATOR(path[i])) i++; - continue; /* move on to next path component */ - } - else if (check_case) - { - if (path[i] != *redir) return 0; + if (strncmpW( path + start, redir, i - start )) return 0; } else { - if (tolowerW(path[i]) != tolowerW(*redir)) return 0; + if (wcsnicmp( path + start, redir, i - start )) return 0; } - i++; - redir++; + redir += i - start; + while (i < len && IS_SEPARATOR(path[i])) i++; + if (!*redir) return i; + if (*redir++ != '\\') return 0; } - if (*redir) return 0; - if (i < len && !IS_SEPARATOR(path[i])) return 0; - while (i < len && IS_SEPARATOR(path[i])) i++; - return i; + return 0; } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8f607409f5..0e2e3f7dd1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1749,16 +1749,17 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING { static const WCHAR nt_prefixW[] = {'\\','?','?','\\',0}; static const WCHAR soW[] = {'.','s','o',0}; - WCHAR *p, *fullname; - size_t i, len = strlen(filename); + WCHAR *p, *fullname, filenameW[256]; + size_t len = strlen(filename); + + if (len >= ARRAY_SIZE(filenameW)) return FALSE; + ascii_to_unicode( filenameW, filename, len + 1 ); /* check if path can correspond to the dll we have */ if (path && (p = strrchrW( path->Buffer, '\\' ))) { p++; - for (i = 0; i < len; i++) - if (tolowerW(p[i]) != tolowerW( (WCHAR)filename[i]) ) break; - if (i == len && (!p[len] || !wcsicmp( p + len, soW ))) + if (!wcsnicmp( p, filenameW, len ) && (!p[len] || !wcsicmp( p + len, soW ))) { /* the filename matches, use path as the full path */ len += p - path->Buffer; @@ -1775,7 +1776,7 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING return FALSE; strcpyW( fullname, nt_prefixW ); strcatW( fullname, system_dir ); - ascii_to_unicode( fullname + strlenW(fullname), filename, len + 1 ); + strcatW( fullname, filenameW ); done: RtlInitUnicodeString( nt_name, fullname ); return TRUE; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 915a644c9d..0969037078 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1496,7 +1496,9 @@ NTSTATUS WINAPI RtlUnicodeToOemN( char *dst, DWORD dstlen, DWORD *reslen, */ WCHAR WINAPI RtlDowncaseUnicodeChar( WCHAR wch ) { - return casemap( nls_info.LowerCaseTable, wch ); + if (nls_info.LowerCaseTable) return casemap( nls_info.LowerCaseTable, wch ); + if (wch >= 'A' && wch <= 'Z') wch += 'a' - 'A'; + return wch; }

1 0

Alexandre Julliard : ntdll: Avoid using memrchrW().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 6fc90887895c0a03b36f69110a7f6ad426f9b2fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fc90887895c0a03b36f6911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:09:38 2020 +0200 ntdll: Avoid using memrchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0e2e3f7dd1..4d4d806d45 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3379,8 +3379,8 @@ NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LP attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if ((p = memrchrW( key->Buffer, '\\', key->Length / sizeof(WCHAR) ))) p++; - else p = key->Buffer; + p = key->Buffer + key->Length / sizeof(WCHAR); + while (p > key->Buffer && p[-1] != '\\') p--; len = key->Length - (p - key->Buffer) * sizeof(WCHAR); name_str.Buffer = path; name_str.Length = sizeof(optionsW) + len;

1 0

Alexandre Julliard : ntdll: Avoid using memchrW().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 186f189107972b739311f95a4ba3833838349b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=186f189107972b739311f95a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:09:44 2020 +0200 ntdll: Avoid using memchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 15 +++++++++------ dlls/ntdll/directory.c | 9 ++++++--- dlls/ntdll/env.c | 18 ++++++++---------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index d5f376f224..cd17c6c135 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1272,6 +1272,7 @@ static xmlstr_t find_xmlns( xmlbuf_t *xmlbuf, const xmlstr_t *name ) static BOOL next_xml_attr(xmlbuf_t *xmlbuf, struct xml_attr *attr, BOOL *end) { const WCHAR* ptr; + WCHAR quote; if (xmlbuf->error) return FALSE; @@ -1319,11 +1320,12 @@ static BOOL next_xml_attr(xmlbuf_t *xmlbuf, struct xml_attr *attr, BOOL *end) if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return set_error( xmlbuf ); - attr->value.ptr = ++ptr; + quote = *ptr++; + attr->value.ptr = ptr; if (ptr == xmlbuf->end) return set_error( xmlbuf ); - ptr = memchrW(ptr, ptr[-1], xmlbuf->end - ptr); - if (!ptr) + while (ptr < xmlbuf->end && *ptr != quote) ptr++; + if (ptr == xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; return set_error( xmlbuf ); @@ -1369,8 +1371,8 @@ static BOOL next_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem, const struct for (;;) { - ptr = memchrW(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr); - if (!ptr) + for (ptr = xmlbuf->ptr; ptr < xmlbuf->end; ptr++) if (*ptr == '<') break; + if (ptr == xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; return set_error( xmlbuf ); @@ -1447,7 +1449,8 @@ static BOOL parse_text_content(xmlbuf_t* xmlbuf, xmlstr_t* content) if (xmlbuf->error) return FALSE; - if (!(ptr = memchrW(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr))) return set_error( xmlbuf ); + for (ptr = xmlbuf->ptr; ptr < xmlbuf->end; ptr++) if (*ptr == '<') break; + if (ptr == xmlbuf->end) return set_error( xmlbuf ); content->ptr = xmlbuf->ptr; content->len = ptr - xmlbuf->ptr; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 80777da149..d025a37241 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -305,9 +305,12 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned static inline BOOL has_wildcard( const UNICODE_STRING *mask ) { - return (!mask || - memchrW( mask->Buffer, '*', mask->Length / sizeof(WCHAR) ) || - memchrW( mask->Buffer, '?', mask->Length / sizeof(WCHAR) )); + int i; + + if (!mask) return TRUE; + for (i = 0; i < mask->Length / sizeof(WCHAR); i++) + if (mask->Buffer[i] == '*' || mask->Buffer[i] == '?') return TRUE; + return FALSE; } /* get space from the current directory data buffer, allocating a new one if necessary */ diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 833da58f35..28be49d0b1 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1081,7 +1081,7 @@ NTSTATUS WINAPI RtlExpandEnvironmentStrings( const WCHAR *renv, WCHAR *src, SIZE WCHAR *dst, SIZE_T count, SIZE_T *plen ) { SIZE_T len, total_size = 1; /* 1 for terminating '\0' */ - LPCWSTR env, p, var; + LPCWSTR env, var; if (!renv) { @@ -1094,27 +1094,26 @@ NTSTATUS WINAPI RtlExpandEnvironmentStrings( const WCHAR *renv, WCHAR *src, SIZE { if (*src != '%') { - if ((p = memchrW( src, '%', src_len ))) len = p - src; - else len = src_len; + for (len = 0; len < src_len; len++) if (src[len] == '%') break; var = src; src += len; src_len -= len; } else /* we are at the start of a variable */ { - if ((p = memchrW( src + 1, '%', src_len - 1 ))) + for (len = 1; len < src_len; len++) if (src[len] == '%') break; + if (len < src_len) { - len = p - src - 1; /* Length of the variable name */ - if ((var = ENV_FindVariable( env, src + 1, len ))) + if ((var = ENV_FindVariable( env, src + 1, len - 1 ))) { - src += len + 2; /* Skip the variable name */ - src_len -= len + 2; + src += len + 1; /* Skip the variable name */ + src_len -= len + 1; len = strlenW(var); } else { var = src; /* Copy original name instead */ - len += 2; + len++; src += len; src_len -= len; } @@ -1122,7 +1121,6 @@ NTSTATUS WINAPI RtlExpandEnvironmentStrings( const WCHAR *renv, WCHAR *src, SIZE else /* unfinished variable name, ignore it */ { var = src; - len = src_len; /* Copy whole string */ src += len; src_len = 0; }

1 0

Alexandre Julliard : ntdll: Avoid using atoiW().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 8f3d869d784753d814a3493d01c3650f45389eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f3d869d784753d814a3493d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:09:49 2020 +0200 ntdll: Avoid using atoiW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/version.c | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index cd17c6c135..d53ddf8694 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3141,10 +3141,10 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) else data_pos = data_len; tmp = dir_info->FileName + (strchrW(lookup, '*') - lookup); - build = atoiW(tmp); + build = wcstoul( tmp, NULL, 10 ); if (build < min_build) continue; tmp = strchrW(tmp, '.') + 1; - revision = atoiW(tmp); + revision = wcstoul( tmp, NULL, 10 ); if (build == min_build && revision < min_revision) continue; tmp = strchrW(tmp, '_') + 1; tmp = strchrW(tmp, '_') + 1; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index fe0d1755d0..ccb2e76c20 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -301,6 +301,7 @@ ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); #define towupper(c) NTDLL_towupper(c) #define wcslwr(s) NTDLL__wcslwr(s) #define wcsupr(s) NTDLL__wcsupr(s) +#define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) /* convert from straight ASCII to Unicode without depending on the current codepage */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 4994dbbb5e..e5fb63e778 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -285,9 +285,9 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) if (p) { *p++ = 0; - version->dwMinorVersion = atoiW( p ); + version->dwMinorVersion = wcstoul( p, NULL, 10 ); } - version->dwMajorVersion = atoiW( str ); + version->dwMajorVersion = wcstoul( str, NULL, 10 ); } if (version->dwMajorVersion) /* we got the main version, now fetch the other fields */ @@ -302,7 +302,7 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) { WCHAR *str = (WCHAR *)info->Data; str[info->DataLength / sizeof(WCHAR)] = 0; - version->dwBuildNumber = atoiW( str ); + version->dwBuildNumber = wcstoul( str, NULL, 10 ); } /* get version description */ @@ -400,7 +400,7 @@ static BOOL get_win9x_registry_version( RTL_OSVERSIONINFOEXW *version ) str[info->DataLength / sizeof(WCHAR)] = 0; p = strchrW( str, '.' ); if (p) *p++ = 0; - version->dwMajorVersion = atoiW( str ); + version->dwMajorVersion = wcstoul( str, NULL, 10 ); if (p) { str = p; @@ -408,9 +408,9 @@ static BOOL get_win9x_registry_version( RTL_OSVERSIONINFOEXW *version ) if (p) { *p++ = 0; - version->dwBuildNumber = atoiW( p ); + version->dwBuildNumber = wcstoul( p, NULL, 10 ); } - version->dwMinorVersion = atoiW( str ); + version->dwMinorVersion = wcstoul( str, NULL, 10 ); } /* build number contains version too on Win9x */ version->dwBuildNumber |= MAKEWORD( version->dwMinorVersion, version->dwMajorVersion ) << 16;

1 0

Alexandre Julliard : ntdll: Avoid using sprintfW().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: eb1b2e548656dc3d08cbf3c35454621491b84126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1b2e548656dc3d08cbf3c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 22:18:41 2020 +0200 ntdll: Avoid using sprintfW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 12 ++++++------ dlls/ntdll/atom.c | 3 ++- dlls/ntdll/env.c | 4 ++-- dlls/ntdll/locale.c | 16 ++++++++-------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/process.c | 2 +- dlls/ntdll/rtl.c | 4 ++-- dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/sec.c | 6 +++--- dlls/ntdll/time.c | 2 +- 10 files changed, 27 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb1b2e548656dc3d08cb…

1 0

Nikolay Sivov : mfplat: Forward MFScheduleWorkItemEx() to rtworkq.dll.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 22d76e0db05485f5978b21ccb2de9d70fa961f97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d76e0db05485f5978b21cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:24 2020 +0300 mfplat: Forward MFScheduleWorkItemEx() to rtworkq.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/queue.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 5af717419b..31d3777e87 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -136,7 +136,7 @@ @ stdcall MFRegisterLocalSchemeHandler(wstr ptr) @ stdcall MFRemovePeriodicCallback(long) rtworkq.RtwqRemovePeriodicCallback @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) -@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) +@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) rtworkq.RtwqScheduleWorkItem @ stub MFSerializeAttributesToStream @ stub MFSerializeEvent @ stub MFSerializeMediaTypeToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 6ad3977e59..2080a79f84 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -119,16 +119,6 @@ HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, I return hr; } -/*********************************************************************** - * MFScheduleWorkItemEx (mfplat.@) - */ -HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) -{ - TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); - - return RtwqScheduleWorkItem((IRtwqAsyncResult *)result, timeout, key); -} - /*********************************************************************** * MFInvokeCallback (mfplat.@) */

1 0