May 2019 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Fix name and data allocation failure handling in alloc_cookie.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 9fec2e0d9593726e3ebeca98defc5c9ab2d4b578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fec2e0d9593726e3ebeca98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 19:50:22 2019 +0200 wininet: Fix name and data allocation failure handling in alloc_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index a1ea1de..30a9e25 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -238,7 +238,7 @@ static cookie_t *alloc_cookie(substr_t name, substr_t data, FILETIME expiry, FIL { cookie_t *new_cookie; - new_cookie = heap_alloc(sizeof(*new_cookie)); + new_cookie = heap_alloc_zero(sizeof(*new_cookie)); if(!new_cookie) return NULL; @@ -247,9 +247,12 @@ static cookie_t *alloc_cookie(substr_t name, substr_t data, FILETIME expiry, FIL new_cookie->flags = flags; list_init(&new_cookie->entry); - new_cookie->name = heap_strndupW(name.str, name.len); - new_cookie->data = heap_strndupW(data.str, data.len); - if(!new_cookie->name || !new_cookie->data) { + if(name.str && !(new_cookie->name = heap_strndupW(name.str, name.len))) { + delete_cookie(new_cookie); + return NULL; + } + + if(data.str && !(new_cookie->data = heap_strndupW(data.str, data.len))) { delete_cookie(new_cookie); return NULL; }

1 0

Manuel Edelmann : kernel32: Added stub for Set/ GetProcessPreferredUILanguages.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: bc7e98a1a90374898937395178bca0d1e7767c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc7e98a1a903748989373951… Author: Manuel Edelmann <varris(a)protonmail.com> Date: Mon May 20 23:54:14 2019 +0200 kernel32: Added stub for Set/GetProcessPreferredUILanguages. Signed-off-by: Manuel Edelmann <varris(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-0.spec | 4 ++-- .../api-ms-win-core-localization-l1-2-1.spec | 4 ++-- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/locale.c | 18 ++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 ++-- 6 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec index 8eb27c4..90f68c5 100644 --- a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec @@ -14,7 +14,7 @@ @ stub GetNLSVersion @ stub GetNLSVersionEx @ stdcall GetOEMCP() kernel32.GetOEMCP -@ stub GetProcessPreferredUILanguages +@ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages @ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID @ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID @ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) kernel32.GetSystemPreferredUILanguages diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 0d7699e..1658483 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -20,7 +20,7 @@ @ stub GetNLSVersion @ stub GetNLSVersionEx @ stdcall GetOEMCP() kernel32.GetOEMCP -@ stub GetProcessPreferredUILanguages +@ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages @ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID @ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID @ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) kernel32.GetSystemPreferredUILanguages @@ -50,7 +50,7 @@ @ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW -@ stub SetProcessPreferredUILanguages +@ stdcall SetProcessPreferredUILanguages(long ptr ptr) kernel32.SetProcessPreferredUILanguages @ stdcall SetThreadLocale(long) kernel32.SetThreadLocale @ stdcall SetThreadPreferredUILanguages(long ptr ptr) kernel32.SetThreadPreferredUILanguages @ stdcall SetThreadUILanguage(long) kernel32.SetThreadUILanguage diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index f5cbab7..da8825b 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -21,7 +21,7 @@ @ stub GetNLSVersion @ stub GetNLSVersionEx @ stdcall GetOEMCP() kernel32.GetOEMCP -@ stub GetProcessPreferredUILanguages +@ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages @ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID @ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID @ stdcall GetSystemPreferredUILanguages(long ptr ptr ptr) kernel32.GetSystemPreferredUILanguages @@ -51,7 +51,7 @@ @ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW -@ stub SetProcessPreferredUILanguages +@ stdcall SetProcessPreferredUILanguages(long ptr ptr) kernel32.SetProcessPreferredUILanguages @ stdcall SetThreadLocale(long) kernel32.SetThreadLocale @ stdcall SetThreadPreferredUILanguages(long ptr ptr) kernel32.SetThreadPreferredUILanguages @ stdcall SetThreadUILanguage(long) kernel32.SetThreadUILanguage diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 13d9351..5f3f1fa 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -786,7 +786,7 @@ @ stdcall GetProcessIdOfThread(long) @ stdcall GetProcessIoCounters(long ptr) @ stdcall GetProcessMitigationPolicy(long long ptr long) -# @ stub GetProcessPreferredUILanguages +@ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) @ stdcall GetProcessPriorityBoost(long ptr) @ stdcall GetProcessShutdownParameters(ptr ptr) # @ stub GetProcessorSystemCycleTime @@ -1429,7 +1429,7 @@ @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) @ stdcall SetProcessMitigationPolicy(long ptr long) -# @ stub SetProcessPreferredUILanguages +@ stdcall SetProcessPreferredUILanguages(long ptr ptr) @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) # @ stub SetProcessUserModeExceptionPolicy diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f1dba13..489e719 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1286,6 +1286,15 @@ static BOOL get_dummy_preferred_ui_language( DWORD flags, ULONG *count, WCHAR *b } /*********************************************************************** + * GetProcessPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetProcessPreferredUILanguages( DWORD flags, ULONG *count, WCHAR *buf, ULONG *size ) +{ + FIXME( "%08x, %p, %p %p\n", flags, count, buf, size ); + return get_dummy_preferred_ui_language( flags, count, buf, size ); +} + +/*********************************************************************** * GetSystemPreferredUILanguages (KERNEL32.@) */ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) @@ -1310,6 +1319,15 @@ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buff } /*********************************************************************** + * SetProcessPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI SetProcessPreferredUILanguages( DWORD flags, PCZZWSTR buffer, PULONG count ) +{ + FIXME("%u, %p, %p\n", flags, buffer, count ); + return TRUE; +} + +/*********************************************************************** * SetThreadPreferredUILanguages (KERNEL32.@) */ BOOL WINAPI SetThreadPreferredUILanguages( DWORD flags, PCZZWSTR buffer, PULONG count ) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 24d7b17..83b9889 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -633,7 +633,7 @@ # @ stub GetProcessInformation # @ stub GetProcessMemoryInfo @ stdcall GetProcessMitigationPolicy(long long ptr long) kernel32.GetProcessMitigationPolicy -@ stub GetProcessPreferredUILanguages +@ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages @ stdcall GetProcessPriorityBoost(long ptr) kernel32.GetProcessPriorityBoost @ stdcall GetProcessShutdownParameters(ptr ptr) kernel32.GetProcessShutdownParameters @ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes @@ -1458,7 +1458,7 @@ # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation @ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy -# @ stub SetProcessPreferredUILanguages +@ stdcall SetProcessPreferredUILanguages(long ptr ptr) kernel32.SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters # @ stub SetProcessValidCallTargets

1 0

Nikolay Sivov : mf: Implement type handler methods for sample grabber stream.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 3139727a97a91b91e74d57ec97a8c19b0093b68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3139727a97a91b91e74d57ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 27 17:07:37 2019 +0300 mf: Implement type handler methods for sample grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 81 ++++++++++++++++++++++++--------- dlls/mf/tests/mf.c | 117 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 172 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3139727a97a91b91e74d…

1 0

Akihiro Sagawa : advapi32/tests: Add more RegLoadMUIString tests.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 90f79099a45437b9a3a0127eaf5d45f8b49b2fec URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f79099a45437b9a3a0127e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:01 2019 +0900 advapi32/tests: Add more RegLoadMUIString tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/Makefile.in | 2 ++ dlls/advapi32/tests/registry.c | 79 ++++++++++++++++++++++++++++++++++++++++- dlls/advapi32/tests/rsrc.rc | 22 ++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 36ce031..12583e5 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -13,3 +13,5 @@ C_SRCS = \ registry.c \ security.c \ service.c + +RC_SRCS = rsrc.rc diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c178e39..911186f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3836,17 +3836,42 @@ todo_wine static void test_RegLoadMUIString(void) { - HMODULE hUser32, hResDll; + HMODULE hUser32, hResDll, hFile; int (WINAPI *pLoadStringW)(HMODULE, UINT, WCHAR *, int); LONG ret; HKEY hkey; DWORD type, size, text_size; UINT i; char buf[64], *p, sysdir[MAX_PATH]; + char with_env_var[128], filename[MAX_PATH], tmp_path[MAX_PATH]; WCHAR textW[64], bufW[64]; WCHAR curdirW[MAX_PATH], sysdirW[MAX_PATH]; const static char tz_value[] = "MUI_Std"; const static WCHAR tz_valueW[] = {'M','U','I','_','S','t','d', 0}; + struct { + const char* value; + DWORD type; + BOOL use_sysdir; + DWORD expected; + DWORD broken_ret; + BOOL todo; + } test_case[] = { + /* 0 */ + { "", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "not a MUI string", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "@unknown.dll", REG_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, + { "@unknown.dll,-10", REG_SZ, TRUE, ERROR_FILE_NOT_FOUND }, + /* 4 */ + { with_env_var, REG_SZ, FALSE, ERROR_SUCCESS, 0, TRUE }, + { with_env_var, REG_EXPAND_SZ, FALSE, ERROR_SUCCESS }, + { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, + { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS }, + /* 8 */ + { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "@%WineMuiExe%,-4", REG_SZ, FALSE, ERROR_NOT_FOUND, ERROR_FILE_NOT_FOUND, TRUE }, + { "@%WineMuiExe%,-39", REG_SZ, FALSE, ERROR_RESOURCE_NAME_NOT_FOUND, 0, TRUE }, + { "@%WineMuiDat%,-16", REG_EXPAND_SZ, FALSE, ERROR_BAD_EXE_FORMAT, ERROR_FILE_NOT_FOUND, TRUE }, + }; if (!pRegLoadMUIStringA || !pRegLoadMUIStringW) { @@ -3869,6 +3894,13 @@ static void test_RegLoadMUIString(void) ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(buf[0] == '@', "got %s\n", buf); + /* setup MUI string for tests */ + strcpy(with_env_var, "@%windir%\\system32\\"); + strcat(with_env_var, &buf[1]); + SetEnvironmentVariableA("WineMuiTest1", buf); + SetEnvironmentVariableA("WineMuiTest2", &buf[1]); + + /* load expecting text */ p = strrchr(buf, ','); *p = '\0'; i = atoi(p + 2); /* skip ',-' */ @@ -3955,7 +3987,52 @@ static void test_RegLoadMUIString(void) ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); RegCloseKey(hkey); + + GetModuleFileNameA(NULL, filename, ARRAY_SIZE(filename)); + SetEnvironmentVariableA("WineMuiExe", filename); + + GetTempPathA(ARRAY_SIZE(tmp_path), tmp_path); + GetTempFileNameA(tmp_path, "mui", 0, filename); + SetEnvironmentVariableA("WineMuiDat", filename); + + /* write dummy data to the file, i.e. it's not a PE file. */ + hFile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "can't open %s\n", filename); + WriteFile(hFile, filename, strlen(filename), &size, NULL); + CloseHandle(hFile); + + for (i = 0; i < ARRAY_SIZE(test_case); i++) + { + size = test_case[i].value ? strlen(test_case[i].value) + 1 : 0; + ret = RegSetValueExA(hkey_main, tz_value, 0, test_case[i].type, + (const BYTE *)test_case[i].value, size); + ok(ret == ERROR_SUCCESS, "[%2u] got %d\n", i, ret); + + size = 0xdeadbeef; + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey_main, tz_valueW, bufW, ARRAY_SIZE(bufW), + &size, 0, + test_case[i].use_sysdir ? sysdirW : NULL); + todo_wine_if(test_case[i].todo) + ok(ret == test_case[i].expected || + broken(test_case[i].value[0] == '%' && ret == ERROR_SUCCESS /* vista */) || + broken(test_case[i].broken_ret && ret == test_case[i].broken_ret /* vista */), + "[%2u] expected %d, got %d\n", i, test_case[i].expected, ret); + if (ret == ERROR_SUCCESS && test_case[i].expected == ERROR_SUCCESS) + { + ok(size == text_size, "[%2u] got %u, expected %u\n", i, size, text_size); + ok(!memcmp(bufW, textW, size), "[%2u] got %s, expected %s\n", i, + wine_dbgstr_wn(bufW, size/sizeof(WCHAR)), + wine_dbgstr_wn(textW, text_size/sizeof(WCHAR))); + } + } + SetCurrentDirectoryW(curdirW); + DeleteFileA(filename); + SetEnvironmentVariableA("WineMuiTest1", NULL); + SetEnvironmentVariableA("WineMuiTest2", NULL); + SetEnvironmentVariableA("WineMuiExe", NULL); + SetEnvironmentVariableA("WineMuiDat", NULL); } START_TEST(registry) diff --git a/dlls/advapi32/tests/rsrc.rc b/dlls/advapi32/tests/rsrc.rc new file mode 100644 index 0000000..35b6171 --- /dev/null +++ b/dlls/advapi32/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2019 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +STRINGTABLE +{ + 1 "dummy" +}

1 0

Akihiro Sagawa : advapi32: RegLoadMUIString doesn' t accept a string without '@' prefix.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 1ed4c150a2d109c2795e280898fdcd3f69d4ff9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ed4c150a2d109c2795e2808… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:03 2019 +0900 advapi32: RegLoadMUIString doesn't accept a string without '@' prefix. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 16 ++++++++-------- dlls/advapi32/tests/registry.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index f889d3b..c3c2950 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3247,6 +3247,12 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer result = RegQueryValueExW(hKey, pwszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); if (result != ERROR_SUCCESS) goto cleanup; + /* '@' is the prefix for resource based string entries. */ + if (*pwszTempBuffer != '@') { + result = ERROR_INVALID_DATA; + goto cleanup; + } + /* Expand environment variables, if appropriate, or copy the original string over. */ if (dwValueType == REG_EXPAND_SZ) { cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); @@ -3262,14 +3268,8 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); } - /* If the value references a resource based string, parse the value and load the string. - * Else just copy over the original value. */ - result = ERROR_SUCCESS; - if (*pwszExpandedBuffer != '@') { /* '@' is the prefix for resource based string entries. */ - lstrcpynW(pwszBuffer, pwszExpandedBuffer, cbBuffer / sizeof(WCHAR)); - if (pcbData) - *pcbData = (strlenW(pwszExpandedBuffer) + 1) * sizeof(WCHAR); - } else { + /* Parse the value and load the string. */ + { WCHAR *pComma = strrchrW(pwszExpandedBuffer, ','), *pNewBuffer; const WCHAR backslashW[] = {'\\',0}; UINT uiStringId; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 911186f..a1b9dd1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3857,14 +3857,14 @@ static void test_RegLoadMUIString(void) BOOL todo; } test_case[] = { /* 0 */ - { "", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, - { "not a MUI string", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "", REG_SZ, FALSE, ERROR_INVALID_DATA }, + { "not a MUI string", REG_SZ, FALSE, ERROR_INVALID_DATA }, { "@unknown.dll", REG_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, { "@unknown.dll,-10", REG_SZ, TRUE, ERROR_FILE_NOT_FOUND }, /* 4 */ { with_env_var, REG_SZ, FALSE, ERROR_SUCCESS, 0, TRUE }, { with_env_var, REG_EXPAND_SZ, FALSE, ERROR_SUCCESS }, - { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, + { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA }, { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS }, /* 8 */ { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE },

1 0

Akihiro Sagawa : advapi32: Expand environment variables even if REG_SZ type is used.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: e798d25f255b205cb6d765f042eb6ca3dfcf566a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e798d25f255b205cb6d765f0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:05 2019 +0900 advapi32: Expand environment variables even if REG_SZ type is used. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 21 ++++++++------------- dlls/advapi32/tests/registry.c | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c3c2950..53b6459 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3253,20 +3253,15 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer goto cleanup; } - /* Expand environment variables, if appropriate, or copy the original string over. */ - if (dwValueType == REG_EXPAND_SZ) { - cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); - if (!cbData) goto cleanup; - pwszExpandedBuffer = heap_alloc(cbData); - if (!pwszExpandedBuffer) { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData / sizeof(WCHAR)); - } else { - pwszExpandedBuffer = heap_alloc(cbData); - memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); + /* Expand environment variables regardless of the type. */ + cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); + if (!cbData) goto cleanup; + pwszExpandedBuffer = heap_alloc(cbData); + if (!pwszExpandedBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; } + ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData / sizeof(WCHAR)); /* Parse the value and load the string. */ { diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a1b9dd1..855f5a8 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3862,7 +3862,7 @@ static void test_RegLoadMUIString(void) { "@unknown.dll", REG_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, { "@unknown.dll,-10", REG_SZ, TRUE, ERROR_FILE_NOT_FOUND }, /* 4 */ - { with_env_var, REG_SZ, FALSE, ERROR_SUCCESS, 0, TRUE }, + { with_env_var, REG_SZ, FALSE, ERROR_SUCCESS }, { with_env_var, REG_EXPAND_SZ, FALSE, ERROR_SUCCESS }, { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA }, { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS },

1 0

Akihiro Sagawa : advapi32: Fix the error code on parse failure.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: cb555215a95eded950cc1d566dff22fcbaf9acbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb555215a95eded950cc1d56… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:07 2019 +0900 advapi32: Fix the error code on parse failure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 53b6459..f18e34f 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3273,7 +3273,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer /* Format of the expanded value is 'path_to_dll,-resId' */ if (!pComma || pComma[1] != '-') { - result = ERROR_BADKEY; + result = ERROR_INVALID_DATA; goto cleanup; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 855f5a8..0f4e196 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3859,7 +3859,7 @@ static void test_RegLoadMUIString(void) /* 0 */ { "", REG_SZ, FALSE, ERROR_INVALID_DATA }, { "not a MUI string", REG_SZ, FALSE, ERROR_INVALID_DATA }, - { "@unknown.dll", REG_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, + { "@unknown.dll", REG_SZ, TRUE, ERROR_INVALID_DATA }, { "@unknown.dll,-10", REG_SZ, TRUE, ERROR_FILE_NOT_FOUND }, /* 4 */ { with_env_var, REG_SZ, FALSE, ERROR_SUCCESS }, @@ -3867,7 +3867,7 @@ static void test_RegLoadMUIString(void) { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA }, { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS }, /* 8 */ - { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA }, { "@%WineMuiExe%,-4", REG_SZ, FALSE, ERROR_NOT_FOUND, ERROR_FILE_NOT_FOUND, TRUE }, { "@%WineMuiExe%,-39", REG_SZ, FALSE, ERROR_RESOURCE_NAME_NOT_FOUND, 0, TRUE }, { "@%WineMuiDat%,-16", REG_EXPAND_SZ, FALSE, ERROR_BAD_EXE_FORMAT, ERROR_FILE_NOT_FOUND, TRUE },

1 0

Akihiro Sagawa : advapi32: Fix the error code on load failure.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 62f52103646c20e81fe7bb76e51dee1813a82edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f52103646c20e81fe7bb76… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:09 2019 +0900 advapi32: Fix the error code on load failure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 12 ++++++------ dlls/advapi32/tests/registry.c | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index f18e34f..8596aea 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3133,6 +3133,10 @@ static INT load_string(HINSTANCE hModule, UINT resId, LPWSTR *pResString) /* Strings are length-prefixed. Lowest nibble of resId is an index. */ idxString = resId & 0xf; while (idxString--) pString += *pString + 1; + if (!*pString) { + SetLastError(ERROR_NOT_FOUND); + return 0; + } *pResString = pString + 1; return *pString; @@ -3153,11 +3157,11 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, hModule = LoadLibraryExW(file_name, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); if (!hModule) - return ERROR_BADKEY; + return GetLastError(); size = load_string(hModule, res_id, &string); if (!size) { - result = ERROR_FILE_NOT_FOUND; + result = GetLastError(); goto cleanup; } *req_chars = size + 1; @@ -3210,10 +3214,6 @@ cleanup: * RETURNS * Success: ERROR_SUCCESS, * Failure: nonzero error code from winerror.h - * - * NOTES - * This is an API of Windows Vista, which wasn't available at the time this code - * was written. We have to check for the correct behaviour once it's available. */ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer, DWORD cbBuffer, LPDWORD pcbData, DWORD dwFlags, LPCWSTR pwszBaseDir) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 0f4e196..8a2fb3b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3854,7 +3854,6 @@ static void test_RegLoadMUIString(void) BOOL use_sysdir; DWORD expected; DWORD broken_ret; - BOOL todo; } test_case[] = { /* 0 */ { "", REG_SZ, FALSE, ERROR_INVALID_DATA }, @@ -3868,9 +3867,9 @@ static void test_RegLoadMUIString(void) { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS }, /* 8 */ { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA }, - { "@%WineMuiExe%,-4", REG_SZ, FALSE, ERROR_NOT_FOUND, ERROR_FILE_NOT_FOUND, TRUE }, - { "@%WineMuiExe%,-39", REG_SZ, FALSE, ERROR_RESOURCE_NAME_NOT_FOUND, 0, TRUE }, - { "@%WineMuiDat%,-16", REG_EXPAND_SZ, FALSE, ERROR_BAD_EXE_FORMAT, ERROR_FILE_NOT_FOUND, TRUE }, + { "@%WineMuiExe%,-4", REG_SZ, FALSE, ERROR_NOT_FOUND, ERROR_FILE_NOT_FOUND }, + { "@%WineMuiExe%,-39", REG_SZ, FALSE, ERROR_RESOURCE_NAME_NOT_FOUND }, + { "@%WineMuiDat%,-16", REG_EXPAND_SZ, FALSE, ERROR_BAD_EXE_FORMAT, ERROR_FILE_NOT_FOUND }, }; if (!pRegLoadMUIStringA || !pRegLoadMUIStringW) @@ -4013,7 +4012,6 @@ static void test_RegLoadMUIString(void) ret = pRegLoadMUIStringW(hkey_main, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, test_case[i].use_sysdir ? sysdirW : NULL); - todo_wine_if(test_case[i].todo) ok(ret == test_case[i].expected || broken(test_case[i].value[0] == '%' && ret == ERROR_SUCCESS /* vista */) || broken(test_case[i].broken_ret && ret == test_case[i].broken_ret /* vista */),

1 0

Akihiro Sagawa : advapi32: Cache result of LoadString.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: b9b5117fe7841bff2ab2cbe2295ff6ab4e3e9844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9b5117fe7841bff2ab2cbe2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:11 2019 +0900 advapi32: Cache result of LoadString. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 144 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 135 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 8596aea..c9b207d 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -44,6 +44,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(reg); @@ -89,6 +90,26 @@ static const WCHAR * const root_key_names[] = static HKEY special_root_keys[ARRAY_SIZE(root_key_names)]; static BOOL hkcu_cache_disabled; +static CRITICAL_SECTION reg_mui_cs; +static CRITICAL_SECTION_DEBUG reg_mui_cs_debug = +{ + 0, 0, &reg_mui_cs, + { &reg_mui_cs_debug.ProcessLocksList, + &reg_mui_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": reg_mui_cs") } +}; +static CRITICAL_SECTION reg_mui_cs = { &reg_mui_cs_debug, -1, 0, 0, 0, 0 }; +struct mui_cache_entry { + struct list entry; + WCHAR *file_name; /* full path name */ + DWORD index; + LCID locale; + WCHAR *text; +}; +static struct list reg_mui_cache = LIST_INIT(reg_mui_cache); /* MRU */ +static unsigned int reg_mui_cache_count; +#define REG_MUI_CACHE_SIZE 8 + static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); /* check if value type needs string conversion (Ansi<->Unicode) */ @@ -3142,10 +3163,95 @@ static INT load_string(HINSTANCE hModule, UINT resId, LPWSTR *pResString) return *pString; } +static void dump_mui_cache(void) +{ + struct mui_cache_entry *ent; + + TRACE("---------- MUI Cache ----------\n"); + LIST_FOR_EACH_ENTRY( ent, &reg_mui_cache, struct mui_cache_entry, entry ) + TRACE("entry=%p, %s,-%u [%#x] => %s\n", + ent, wine_dbgstr_w(ent->file_name), ent->index, ent->locale, wine_dbgstr_w(ent->text)); +} + +static inline void free_mui_cache_entry(struct mui_cache_entry *ent) +{ + heap_free(ent->file_name); + heap_free(ent->text); + heap_free(ent); +} + +/* critical section must be held */ +static int reg_mui_cache_get(const WCHAR *file_name, UINT index, WCHAR **buffer) +{ + struct mui_cache_entry *ent; + + TRACE("(%s %u %p)\n", wine_dbgstr_w(file_name), index, buffer); + + LIST_FOR_EACH_ENTRY(ent, &reg_mui_cache, struct mui_cache_entry, entry) + { + if (ent->index == index && ent->locale == GetThreadLocale() && + !strcmpiW(ent->file_name, file_name)) + goto found; + } + return 0; + +found: + /* move to the list head */ + if (list_prev(&reg_mui_cache, &ent->entry)) { + list_remove(&ent->entry); + list_add_head(&reg_mui_cache, &ent->entry); + } + + TRACE("=> %s\n", wine_dbgstr_w(ent->text)); + *buffer = ent->text; + return strlenW(ent->text); +} + +/* critical section must be held */ +static void reg_mui_cache_put(const WCHAR *file_name, UINT index, const WCHAR *buffer, INT size) +{ + struct mui_cache_entry *ent; + TRACE("(%s %u %s %d)\n", wine_dbgstr_w(file_name), index, wine_dbgstr_wn(buffer, size), size); + + ent = heap_calloc(sizeof(*ent), 1); + if (!ent) + return; + ent->file_name = heap_alloc((strlenW(file_name) + 1) * sizeof(WCHAR)); + if (!ent->file_name) { + free_mui_cache_entry(ent); + return; + } + strcpyW(ent->file_name, file_name); + ent->index = index; + ent->locale = GetThreadLocale(); + ent->text = heap_alloc((size + 1) * sizeof(WCHAR)); + if (!ent->text) { + free_mui_cache_entry(ent); + return; + } + memcpy(ent->text, buffer, size * sizeof(WCHAR)); + ent->text[size] = '\0'; + + TRACE("add %p\n", ent); + list_add_head(&reg_mui_cache, &ent->entry); + if (reg_mui_cache_count > REG_MUI_CACHE_SIZE) { + ent = LIST_ENTRY( list_tail( &reg_mui_cache ), struct mui_cache_entry, entry ); + TRACE("freeing %p\n", ent); + list_remove(&ent->entry); + free_mui_cache_entry(ent); + } + else + reg_mui_cache_count++; + + if (TRACE_ON(reg)) + dump_mui_cache(); + return; +} + static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, INT max_chars, INT *req_chars, DWORD flags) { HMODULE hModule = NULL; - WCHAR *string; + WCHAR *string, *full_name; int size; LONG result; @@ -3153,16 +3259,32 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, if (GetFileAttributesW(file_name) == INVALID_FILE_ATTRIBUTES) return ERROR_FILE_NOT_FOUND; - /* Load the file */ - hModule = LoadLibraryExW(file_name, NULL, - LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); - if (!hModule) + size = GetFullPathNameW(file_name, 0, NULL, NULL); + full_name = heap_alloc(size * sizeof(WCHAR)); + if (!size) return GetLastError(); + GetFullPathNameW(file_name, size, full_name, NULL); - size = load_string(hModule, res_id, &string); + EnterCriticalSection(&reg_mui_cs); + size = reg_mui_cache_get(full_name, res_id, &string); if (!size) { - result = GetLastError(); - goto cleanup; + LeaveCriticalSection(&reg_mui_cs); + + /* Load the file */ + hModule = LoadLibraryExW(full_name, NULL, + LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); + if (!hModule) + return GetLastError(); + + size = load_string(hModule, res_id, &string); + if (!size) { + result = GetLastError(); + goto cleanup; + } + + EnterCriticalSection(&reg_mui_cs); + reg_mui_cache_put(full_name, res_id, string, size); + LeaveCriticalSection(&reg_mui_cs); } *req_chars = size + 1; @@ -3191,7 +3313,11 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, result = ERROR_SUCCESS; cleanup: - if (hModule) FreeLibrary(hModule); + if (hModule) + FreeLibrary(hModule); + else + LeaveCriticalSection(&reg_mui_cs); + heap_free(full_name); return result; }

1 0

Alistair Leslie-Hughes : amstream: Leave critical section on success ( Coverity).
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 623085d550dae23eb057681f58f276cb8c38eb80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=623085d550dae23eb057681f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 26 22:49:20 2019 +0000 amstream: Leave critical section on success (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 2daffea..48dfc85 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -367,6 +367,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, c { CoTaskMemFree(ret_id); *out = pin; + LeaveCriticalSection(&filter->cs); return S_OK; } CoTaskMemFree(ret_id);

1 0