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

Hugh McMaster : reg/tests: Split 'export' tests from reg.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 60701b02981980dbd821b59f46c102b6f80a79cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=60701b02981980dbd821b59f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:51 2021 +1100 reg/tests: Split 'export' tests from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/Makefile.in | 1 + programs/reg/tests/export.c | 416 +++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 383 ------------------------------------- 3 files changed, 417 insertions(+), 383 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60701b02981980dbd821…

1 0

Hugh McMaster : reg/tests: Split 'copy' tests from reg.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: cc4cc7086faf087590d22b9b58b6c45386e181c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc4cc7086faf087590d22b9b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:52 2021 +1100 reg/tests: Split 'copy' tests from reg.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/Makefile.in | 1 + programs/reg/tests/copy.c | 110 +++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 80 ------------------------------ 3 files changed, 111 insertions(+), 80 deletions(-) diff --git a/programs/reg/tests/Makefile.in b/programs/reg/tests/Makefile.in index 6f0f9ce7c5c..7458e32348c 100644 --- a/programs/reg/tests/Makefile.in +++ b/programs/reg/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = reg.exe IMPORTS = advapi32 C_SRCS = \ + copy.c \ delete.c \ export.c \ import.c \ diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c new file mode 100644 index 00000000000..b91352c9d46 --- /dev/null +++ b/programs/reg/tests/copy.c @@ -0,0 +1,110 @@ +/* + * Copyright 2021 Hugh McMaster + * + * 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 + */ + +#include "reg_test.h" + +#define COPY_DEST KEY_WINE "\\reg_copy" + +static void test_copy(void) +{ + DWORD r; + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg copy", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /h", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /? /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /? /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST " /a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST " /f /a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE " /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + +START_TEST(copy) +{ + DWORD r; + + if (!run_reg_exe("reg.exe /?", &r)) { + win_skip("reg.exe not available, skipping reg.exe tests\n"); + return; + } + + test_copy(); +} diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d8a281548a5..d1af7831f4d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -613,85 +613,6 @@ static void test_add(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE); } -#define COPY_DEST KEY_WINE "\\reg_copy" - -static void test_copy(void) -{ - DWORD r; - - delete_tree(HKEY_CURRENT_USER, KEY_BASE); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - - run_reg_exe("reg copy", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /?", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg copy /h", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg copy -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg copy /? /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /h /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /? /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /h /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /s /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /f /s", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE" /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/a", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/f /a", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); -} - START_TEST(reg) { DWORD r; @@ -702,5 +623,4 @@ START_TEST(reg) } test_add(); - test_copy(); }

1 0

Hugh McMaster : reg/tests: Rename reg.c to add.c.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 3c2db20f66806074b047b0b3c76aa86ad79e3175 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2db20f66806074b047b0b3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 1 14:16:53 2021 +1100 reg/tests: Rename reg.c to add.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/Makefile.in | 4 ++-- programs/reg/tests/{reg.c => add.c} | 14 +++++++++++++- programs/reg/tests/reg_test.h | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/Makefile.in b/programs/reg/tests/Makefile.in index 7458e32348c..6d7530bb5d6 100644 --- a/programs/reg/tests/Makefile.in +++ b/programs/reg/tests/Makefile.in @@ -2,9 +2,9 @@ TESTDLL = reg.exe IMPORTS = advapi32 C_SRCS = \ + add.c \ copy.c \ delete.c \ export.c \ import.c \ - query.c \ - reg.c + query.c diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/add.c similarity index 99% rename from programs/reg/tests/reg.c rename to programs/reg/tests/add.c index d1af7831f4d..bdfd429367c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/add.c @@ -353,8 +353,10 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin2 /f /d x01", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin3 /f /d 01x", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -397,13 +399,17 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword0 /t REG_DWORD /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -431,6 +437,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); @@ -503,14 +510,19 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s \"\\0\" /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -613,7 +625,7 @@ static void test_add(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE); } -START_TEST(reg) +START_TEST(add) { DWORD r; diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 73457f0ee37..2f4bdf36437 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -30,7 +30,7 @@ #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 -/* Helper functions */ +/* add.c */ #define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc);

1 0

Esme Povirk : mscoree: Add an option to enable the interpreter.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 76f87fe30c0425332740c6a59786cf3c5a55f5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f87fe30c0425332740c6a5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sun Feb 28 15:45:05 2021 -0600 mscoree: Add an option to enable the interpreter. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 28 ++++++++++++++++++++++++++++ dlls/mscoree/mscoree_private.h | 12 ++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d9b599fadc7..907d8af9791 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -106,6 +106,7 @@ MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, ch static void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init_version)(const char *domain_name, const char *runtime_version); +static void (CDECL *mono_jit_set_aot_mode)(MonoAotMode mode); static int (CDECL *mono_jit_set_trace_options)(const char* options); void* (CDECL *mono_marshal_get_vtfixup_ftnptr)(MonoImage *image, DWORD token, WORD type); MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); @@ -158,6 +159,8 @@ static HRESULT load_mono(LPCWSTR mono_path) WCHAR mono_dll_path[MAX_PATH+16]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; + int aot_size; + char aot_setting[256]; int trace_size; char trace_setting[256]; int verbose_size; @@ -239,6 +242,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_OPT_MONO_FUNCTION(mono_callspec_set_assembly, NULL); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_jit_set_aot_mode, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_create, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_install, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_set_runtime_shutdown_begin_callback, NULL); @@ -277,6 +281,30 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); + aot_size = GetEnvironmentVariableA("WINE_MONO_AOT", aot_setting, sizeof(aot_setting)); + + if (aot_size) + { + MonoAotMode mode; + if (strcmp(aot_setting, "interp") == 0) + mode = MONO_AOT_MODE_INTERP_ONLY; + else if (strcmp(aot_setting, "none") == 0) + mode = MONO_AOT_MODE_NONE; + else + { + ERR("unknown WINE_MONO_AOT setting, valid settings are interp and none\n"); + mode = MONO_AOT_MODE_NONE; + } + if (mono_jit_set_aot_mode != NULL) + { + mono_jit_set_aot_mode(mode); + } + else + { + ERR("mono_jit_set_aot_mode export not found\n"); + } + } + trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); if (trace_size) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index da587285cfe..69c30e5e3e0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -147,6 +147,18 @@ typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout); +typedef enum { + MONO_AOT_MODE_NONE, + MONO_AOT_MODE_NORMAL, + MONO_AOT_MODE_HYBRID, + MONO_AOT_MODE_FULL, + MONO_AOT_MODE_LLVMONLY, + MONO_AOT_MODE_INTERP, + MONO_AOT_MODE_INTERP_LLVMONLY, + MONO_AOT_MODE_LLVMONLY_INTERP, + MONO_AOT_MODE_INTERP_ONLY +} MonoAotMode; + extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : comctl32/listbox: Actually draw themed frame.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 7fba4ebba3e8659608da8ceaecd8849c20afe75e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fba4ebba3e8659608da8cea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:09:40 2021 +0800 comctl32/listbox: Actually draw themed frame. Previously, LISTBOX_NCPaint() is called and themed frame is drawn. And then DefWindowProcW() is called with original clip region, overwriting the drawn themed frame. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b905beee325..137b08ce678 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1186,7 +1186,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) return 0; } -static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) +static LRESULT LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) { DWORD exstyle = GetWindowLongW( descr->self, GWL_EXSTYLE); HTHEME theme = GetWindowTheme( descr->self ); @@ -1196,7 +1196,7 @@ static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) RECT r; if (!theme || !(exstyle & WS_EX_CLIENTEDGE)) - return; + return DefWindowProcW(descr->self, WM_NCPAINT, (WPARAM)region, 0); cxEdge = GetSystemMetrics(SM_CXEDGE); cyEdge = GetSystemMetrics(SM_CYEDGE); @@ -1217,6 +1217,11 @@ static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) DrawThemeParentBackground(descr->self, hdc, &r); DrawThemeBackground (theme, hdc, 0, 0, &r, 0); ReleaseDC(descr->self, hdc); + + /* Call default proc to get the scrollbars etc. also painted */ + DefWindowProcW(descr->self, WM_NCPAINT, (WPARAM)cliprgn, 0); + DeleteObject(cliprgn); + return 0; } /*********************************************************************** @@ -2976,8 +2981,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, return ret; case WM_NCPAINT: - LISTBOX_NCPaint( descr, (HRGN)wParam ); - break; + return LISTBOX_NCPaint( descr, (HRGN)wParam ); case WM_SIZE: LISTBOX_UpdateSize( descr );

1 0

Zhiyi Zhang : comctl32: Fix memory leaks.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: a8502312c60fe9fe0bd2aec78553b78325832e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8502312c60fe9fe0bd2aec7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:09:48 2021 +0800 comctl32: Fix memory leaks. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 4 +++- dlls/comctl32/listview.c | 1 + dlls/comctl32/treeview.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f84ef1eb168..a4bca2f9306 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2514,7 +2514,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r abs(es->selection_end - es->selection_start) - strl, hrgn); strl = 0; e = s; - hrgn = CreateRectRgn(0, 0, 0, 0); + SetRectRgn(hrgn, 0, 0, 0, 0); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); } } @@ -3674,6 +3674,8 @@ static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) /* Call default proc to get the scrollbars etc. also painted */ DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); + if (cliprgn != region) + DeleteObject(cliprgn); } /********************************************************************* diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0c80b6164a9..0a05c0668ae 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10645,6 +10645,7 @@ static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) /* Call default proc to get the scrollbars etc. painted */ DefWindowProcW (infoPtr->hwndSelf, WM_NCPAINT, (WPARAM)cliprgn, 0); + DeleteObject(cliprgn); return FALSE; } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 7f9a6f88cee..0e4a92a466f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5468,6 +5468,7 @@ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM /* Call default proc to get the scrollbars etc. painted */ DefWindowProcW (infoPtr->hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); + DeleteObject(cliprgn); return TRUE; }

1 0

Zhiyi Zhang : user32: Fix memory leaks.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 92a8c691948118906e2604c1f243a5ca6d8c5cad URL: https://source.winehq.org/git/wine.git/?a=commit;h=92a8c691948118906e2604c1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:09:55 2021 +0800 user32: Fix memory leaks. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- dlls/user32/nonclient.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 515341f65ea..4de206aa12f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2633,7 +2633,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r abs(es->selection_end - es->selection_start) - strl, hrgn); strl = 0; e = s; - hrgn = CreateRectRgn(0, 0, 0, 0); + SetRectRgn(hrgn, 0, 0, 0, 0); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); } } diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 8cfd3c0d371..e56c03deaf0 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -976,7 +976,11 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) hdc = GetDCEx( hwnd, hrgn, DCX_USESTYLE | DCX_WINDOW | DCX_EXCLUDERGN ); } - if (!hdc) return; + if (!hdc) + { + DeleteObject( hrgn ); + return; + } WIN_GetRectangles( hwnd, COORDS_WINDOW, &rect, NULL ); GetClipBox( hdc, &rectClip );

1 0

Zhiyi Zhang : comdlg32: Fix a memory leak.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 665fa81a511f94f97b62f074959e07a25ea7d307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=665fa81a511f94f97b62f074… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:10:02 2021 +0800 comdlg32: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/colordlg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 7ab5efd0962..d5254736b24 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -523,6 +523,7 @@ static void CC_PaintCross(CCPRIV *infoPtr) int wc = GetDialogBaseUnits() * 3 / 4; RECT rect; POINT point, p; + HRGN region; HPEN hPen; int x, y; @@ -531,7 +532,9 @@ static void CC_PaintCross(CCPRIV *infoPtr) GetClientRect(hwnd, &rect); hDC = GetDC(hwnd); - SelectClipRgn( hDC, CreateRectRgnIndirect(&rect)); + region = CreateRectRgnIndirect(&rect); + SelectClipRgn(hDC, region); + DeleteObject(region); point.x = ((long)rect.right * (long)x) / (long)MAXHORI; point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT;

1 0

Zhiyi Zhang : comctl32: Remove unnecessary OffsetRect() calls.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: c1395d9255e1a5a9db37c3520fc6d0f7c6563e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1395d9255e1a5a9db37c352… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 1 11:10:09 2021 +0800 comctl32: Remove unnecessary OffsetRect() calls. Target rectangles are already offset by previous OffsetRect() calls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 1 - dlls/comctl32/listbox.c | 1 - dlls/comctl32/listview.c | 1 - dlls/comctl32/treeview.c | 1 - 4 files changed, 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index a4bca2f9306..05920893c93 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3664,7 +3664,6 @@ static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) OffsetRect(&r, -r.left, -r.top); dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) DrawThemeParentBackground(hwnd, dc, &r); diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 137b08ce678..239f54aafab 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1211,7 +1211,6 @@ static LRESULT LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) OffsetRect(&r, -r.left, -r.top); hdc = GetDCEx(descr->self, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(descr->self, hdc, &r); diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0a05c0668ae..a62ac4398cc 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10636,7 +10636,6 @@ static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) OffsetRect(&r, -r.left, -r.top); dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(infoPtr->hwndSelf, dc, &r); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0e4a92a466f..a45096d8239 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5459,7 +5459,6 @@ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM OffsetRect(&r, -r.left, -r.top); dc = GetDCEx(infoPtr->hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(infoPtr->hwnd, dc, &r);

1 0

Nikolay Sivov : msado15: Fix copy-paste typos in IDispatch methods.
by Alexandre Julliard 01 Mar '21

01 Mar '21

Module: wine Branch: master Commit: 971be2888be7d1ffff91706aea89772d3968c5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=971be2888be7d1ffff91706a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 27 15:45:44 2021 +0300 msado15: Fix copy-paste typos in IDispatch methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 2 +- dlls/msado15/stream.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index aff12f6a108..8c8ec79a58e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -133,7 +133,7 @@ static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID rii TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Command_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &command->Command_iface, member, flags, params, diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 961aed6a739..424ba722a26 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -113,7 +113,7 @@ static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLEST TRACE( "%p, %s, %p, %u, %u, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Stream_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); @@ -133,7 +133,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Stream_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &stream->Stream_iface, member, flags, params,

1 0