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

Alexandre Julliard : activeds: Build with msvcrt.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 075b478ff304303c8bcc49baaf5455bcbf7470c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075b478ff304303c8bcc49ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:49:33 2019 +0200 activeds: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/Makefile.in | 2 ++ dlls/activeds/activeds_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index f8a10ab..20578a9 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -1,4 +1,6 @@ MODULE = activeds.dll IMPORTLIB = activeds +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = activeds_main.c diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 15a329e..69c5c44 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -33,7 +33,6 @@ #include "iads.h" #include "adshlp.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(activeds);

1 0

Sven Baars : d3dx9: Release the full parameter name when a parameter is released (Valgrind).
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 63443f249f4dfe748ce3872e74ecf5c1d8aa55d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63443f249f4dfe748ce3872e… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 25 13:59:49 2019 +0200 d3dx9: Release the full parameter name when a parameter is released (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a4bce69..4b6321b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -581,6 +581,9 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil HeapFree(GetProcessHeap(), 0, param->members); } + if (param->full_name) + heap_free(param->full_name); + free_parameter_data(param, child); /* only the parent has to release name and semantic */

1 0

Alexandre Julliard : adsldpc: Build with msvcrt.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 1ff9bbd07142c0aa79eaaf253efec0a4779fd0fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ff9bbd07142c0aa79eaaf25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:50:40 2019 +0200 adsldpc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldpc/Makefile.in | 2 ++ dlls/adsldpc/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/adsldpc/Makefile.in b/dlls/adsldpc/Makefile.in index 4dad141..bcee0d4 100644 --- a/dlls/adsldpc/Makefile.in +++ b/dlls/adsldpc/Makefile.in @@ -1,4 +1,6 @@ MODULE = adsldpc.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/adsldpc/main.c b/dlls/adsldpc/main.c index 56eff5d..f9df390 100644 --- a/dlls/adsldpc/main.c +++ b/dlls/adsldpc/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : acledit: Build with msvcrt.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: dec89ddd0934ad07f72a9acd38392e83c85edd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec89ddd0934ad07f72a9acd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:48:57 2019 +0200 acledit: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/acledit/Makefile.in | 2 ++ dlls/acledit/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in index f503874..941eb07 100644 --- a/dlls/acledit/Makefile.in +++ b/dlls/acledit/Makefile.in @@ -1,4 +1,6 @@ MODULE = acledit.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index 49de8b5..50797c0 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -25,7 +25,6 @@ #include "winuser.h" #include "wfext.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(acledit);

1 0

Andrey Gusev : ext-ms-win-shell-comctl32-init-l1-1-0: Add dll.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: f1c60104a7bd23ade044332978f256dc643d4a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1c60104a7bd23ade0443329… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 25 16:54:14 2019 +0300 ext-ms-win-shell-comctl32-init-l1-1-0: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46090 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-shell-comctl32-init-l1-1-0/Makefile.in | 1 + .../ext-ms-win-shell-comctl32-init-l1-1-0.spec | 1 + tools/make_specfiles | 4 ++++ 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 4e408bd..396ca9e 100755 --- a/configure +++ b/configure @@ -1315,6 +1315,7 @@ enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 +enable_ext_ms_win_shell_comctl32_init_l1_1_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_feclient @@ -20178,6 +20179,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 enable_ex wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-shell-comctl32-init-l1-1-0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests diff --git a/configure.ac b/configure.ac index f548e3e..01b26f2 100644 --- a/configure.ac +++ b/configure.ac @@ -3251,6 +3251,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/Makefile.in b/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/Makefile.in new file mode 100644 index 0000000..b880c28 --- /dev/null +++ b/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-shell-comctl32-init-l1-1-0.dll diff --git a/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/ext-ms-win-shell-comctl32-init-l1-1-0.spec b/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/ext-ms-win-shell-comctl32-init-l1-1-0.spec new file mode 100644 index 0000000..e14fc55 --- /dev/null +++ b/dlls/ext-ms-win-shell-comctl32-init-l1-1-0/ext-ms-win-shell-comctl32-init-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall InitCommonControlsEx(ptr) comctl32.InitCommonControlsEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 4a8cc9a..1678e17 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -153,6 +153,10 @@ my @dll_groups = "ext-ms-win-authz-context-l1-1-0", ], [ + "comctl32", + "ext-ms-win-shell-comctl32-init-l1-1-0", + ], + [ "credui", "ext-ms-win-security-credui-l1-1-0", ],

1 0

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

May 27, 2019

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: Expand environment variables even if REG_SZ type is used.
by Alexandre Julliard May 27, 2019

May 27, 2019

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: RegLoadMUIString doesn' t accept a string without '@' prefix.
by Alexandre Julliard May 27, 2019

May 27, 2019

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: Cache result of LoadString.
by Alexandre Julliard May 27, 2019

May 27, 2019

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

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

May 27, 2019

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