wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Alexandre Julliard : adsldp: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 2148d43be3037cf09654dc5ec618d041989e4e2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2148d43be3037cf09654dc5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:50:32 2019 +0200 adsldp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index c96e264..4dce14f 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,6 +1,8 @@ MODULE = adsldp.dll IMPORTS = oleaut32 secur32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ adsldp.c

1 0

Alexandre Julliard : actxprxy: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 143bf4346526d6d006b2e593b560575bf7e21b5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=143bf4346526d6d006b2e593… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:50:22 2019 +0200 actxprxy: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/actxprxy/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index a4618bd..0517a4d 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -1,6 +1,8 @@ MODULE = actxprxy.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ usrmarshal.c

1 0

Alexandre Julliard : activeds: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

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

Alexandre Julliard : aclui: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 420e6cb244763e9067372e52e5101275da42603d URL: https://source.winehq.org/git/wine.git/?a=commit;h=420e6cb244763e9067372e52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:49:19 2019 +0200 aclui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 2 ++ dlls/aclui/aclui_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index f5b401c..83bd379 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,4 +1,6 @@ MODULE = aclui.dll IMPORTLIB = aclui +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = aclui_main.c diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 808f1f0..033a471 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_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 "initguid.h"

1 0

Alexandre Julliard : acledit: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

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-shell32-l1-2-0: Add dll.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 48505cad0564570edb6a6dd277431e250df52a2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48505cad0564570edb6a6dd2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 25 16:55:44 2019 +0300 ext-ms-win-shell-shell32-l1-2-0: Add dll. 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-shell32-l1-2-0/Makefile.in | 1 + .../ext-ms-win-shell-shell32-l1-2-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index dea836b..90c8e1a 100755 --- a/configure +++ b/configure @@ -1317,6 +1317,7 @@ 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_shell_comdlg32_l1_1_0 +enable_ext_ms_win_shell_shell32_l1_2_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_feclient @@ -20182,6 +20183,7 @@ wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win 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-shell-comdlg32-l1-1-0 enable_ext_ms_win_shell_comdlg32_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-shell-shell32-l1-2-0 enable_ext_ms_win_shell_shell32_l1_2_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 941d64f..ef7af70 100644 --- a/configure.ac +++ b/configure.ac @@ -3253,6 +3253,7 @@ 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-shell-comdlg32-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-shell32-l1-2-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-shell32-l1-2-0/Makefile.in b/dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in new file mode 100644 index 0000000..2d8bcf9 --- /dev/null +++ b/dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-shell-shell32-l1-2-0.dll diff --git a/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec b/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec new file mode 100644 index 0000000..8b8739a --- /dev/null +++ b/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec @@ -0,0 +1 @@ +@ stdcall ShellExecuteW(long wstr wstr wstr wstr long) shell32.ShellExecuteW diff --git a/tools/make_specfiles b/tools/make_specfiles index 9449c22..c2fa929 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -352,6 +352,7 @@ my @dll_groups = "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0", "api-ms-win-shell-shellfolders-l1-1-0", + "ext-ms-win-shell-shell32-l1-2-0", ], [ "shlwapi",

1 0

Andrey Gusev : ext-ms-win-shell-comdlg32-l1-1-0: Add dll.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: f40c21c3c307c9bce1dafcdedf85918a3a471cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40c21c3c307c9bce1dafcde… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 25 16:55:27 2019 +0300 ext-ms-win-shell-comdlg32-l1-1-0: Add dll. 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-comdlg32-l1-1-0/Makefile.in | 1 + .../ext-ms-win-shell-comdlg32-l1-1-0.spec | 3 +++ tools/make_specfiles | 4 ++++ 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 396ca9e..dea836b 100755 --- a/configure +++ b/configure @@ -1316,6 +1316,7 @@ 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_shell_comdlg32_l1_1_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_feclient @@ -20180,6 +20181,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ex 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-shell-comdlg32-l1-1-0 enable_ext_ms_win_shell_comdlg32_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 01b26f2..941d64f 100644 --- a/configure.ac +++ b/configure.ac @@ -3252,6 +3252,7 @@ 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-shell-comdlg32-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-comdlg32-l1-1-0/Makefile.in b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in new file mode 100644 index 0000000..da2014d --- /dev/null +++ b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-shell-comdlg32-l1-1-0.dll diff --git a/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec new file mode 100644 index 0000000..1fd45c3 --- /dev/null +++ b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall CommDlgExtendedError() comdlg32.CommDlgExtendedError +@ stdcall GetOpenFileNameW(ptr) comdlg32.GetOpenFileNameW +@ stdcall GetSaveFileNameW(ptr) comdlg32.GetSaveFileNameW diff --git a/tools/make_specfiles b/tools/make_specfiles index 1678e17..9449c22 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,6 +157,10 @@ my @dll_groups = "ext-ms-win-shell-comctl32-init-l1-1-0", ], [ + "comdlg32", + "ext-ms-win-shell-comdlg32-l1-1-0", + ], + [ "credui", "ext-ms-win-security-credui-l1-1-0", ],

1 0

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

27 May '19

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

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019