July 2022 - Wine-commits - list.winehq.org

Dmitry Timoshkov : include: Fix a typo in _InterlockedXor64() intrinsic declaration.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 82c30480c98cf57b66601c9f9b0b24561ad112ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c30480c98cf57b66601c9f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 7 12:44:05 2022 +0300 include: Fix a typo in _InterlockedXor64() intrinsic declaration. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 50f6452b145..5de6884e7de 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6421,7 +6421,7 @@ DECLSPEC_NORETURN void __fastfail(unsigned int); #pragma intrinsic(_InterlockedExchangePointer) #pragma intrinsic(_InterlockedIncrement64) #pragma intrinsic(_InterlockedOr64) -#pragma intrinsic(_InterlockedXord64) +#pragma intrinsic(_InterlockedXor64) __int64 _InterlockedAnd64(__int64 volatile *, __int64); void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*);

1 0

Rémi Bernon : widl: Fix missing support for struct / union parameterized type replacement.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 25e1fb45db5c31faff0dab4d26737d9800623742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e1fb45db5c31faff0dab4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 13 10:52:44 2022 +0100 widl: Fix missing support for struct / union parameterized type replacement. And we can just pass them through, as with other class types. This fixes widl not accepting EventRegistrationToken method argument type in a parameterized type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/typetree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 800ddf77219..3ad140d520c 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -1157,6 +1157,9 @@ static type_t *replace_type_parameters_in_type(type_t *type, typeref_list_t *ori case TYPE_INTERFACE: case TYPE_RUNTIMECLASS: case TYPE_DELEGATE: + case TYPE_STRUCT: + case TYPE_ENCAPSULATED_UNION: + case TYPE_UNION: return type; case TYPE_PARAMETER: if (!orig || !repl) return NULL; @@ -1194,9 +1197,6 @@ static type_t *replace_type_parameters_in_type(type_t *type, typeref_list_t *ori if (t->type_type != TYPE_PARAMETERIZED_TYPE) return find_parameterized_type(type, repl); repl = replace_type_parameters_in_type_list(type->details.parameterized.params, orig, repl); return replace_type_parameters_in_type(t, t->details.parameterized.params, repl); - case TYPE_STRUCT: - case TYPE_ENCAPSULATED_UNION: - case TYPE_UNION: case TYPE_MODULE: case TYPE_COCLASS: case TYPE_APICONTRACT:

1 0

Rémi Bernon : widl: Support namespaces for union declarations.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 837297c21f69098dea3d6b4d61838c46d98d0f53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=837297c21f69098dea3d6b4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 25 12:44:18 2022 +0200 widl: Support namespaces for union declarations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/parser.y | 6 +++--- tools/widl/typetree.c | 9 +++++---- tools/widl/typetree.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 02db99a55b7..4000f37032c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -477,7 +477,7 @@ typedecl: | structdef | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef - | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } + | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } | attributes structdef { $$ = $2; $$->attrs = check_struct_attrs($1); } | attributes uniondef { $$ = $2; $$->attrs = check_union_attrs($1); } @@ -1277,7 +1277,7 @@ unqualified_type: | structdef { $$ = $1; } | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef { $$ = $1; } - | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } + | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } | aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } ; @@ -1296,7 +1296,7 @@ typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list ; uniondef: tUNION m_typename '{' ne_union_fields '}' - { $$ = type_new_nonencapsulated_union($2, TRUE, $4); } + { $$ = type_new_nonencapsulated_union($2, current_namespace, TRUE, $4); } | tUNION m_typename tSWITCH '(' s_field ')' m_ident '{' cases '}' { $$ = type_new_encapsulated_union($2, $5, $7, $9); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 3ad140d520c..fef9d2e5c03 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -580,19 +580,20 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va return t; } -type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields) +type_t *type_new_nonencapsulated_union(const char *name, struct namespace *namespace, int defined, var_list_t *fields) { type_t *t = NULL; if (name) - t = find_type(name, NULL, tsUNION); + t = find_type(name, namespace, tsUNION); if (!t) { t = make_type(TYPE_UNION); t->name = name; + t->namespace = namespace; if (name) - reg_type(t, name, NULL, tsUNION); + reg_type(t, name, namespace, tsUNION); } if (!t->defined && defined) @@ -627,7 +628,7 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio { if (!union_field) union_field = make_var(xstrdup("tagged_union")); - union_field->declspec.type = type_new_nonencapsulated_union(gen_name(), TRUE, cases); + union_field->declspec.type = type_new_nonencapsulated_union(gen_name(), NULL, TRUE, cases); t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = append_var(NULL, switch_field); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 8f5e1ebdac5..be2288db021 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -53,7 +53,7 @@ type_t *type_new_void(void); type_t *type_coclass_declare(char *name); type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums); type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields); -type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields); +type_t *type_new_nonencapsulated_union(const char *name, struct namespace *namespace, int defined, var_list_t *fields); type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace);

1 0

Zhiyi Zhang : atl110: Add importlib.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: b6225478e5b255777e9df7c6aee5941c22673d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6225478e5b255777e9df7c6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 6 21:26:18 2022 +0800 atl110: Add importlib. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/atl110/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index 49ba9338125..d33d30d2820 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,4 +1,5 @@ MODULE = atl110.dll +IMPORTLIB = atl110 IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_110 PARENTSRC = ../atl

1 0

Zhiyi Zhang : atl: Avoid NULL pointer reference in AtlComModuleGetClassObject().
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 5739db59d4c9c379776257d99a3e447f078e43bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5739db59d4c9c379776257d9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 28 11:57:28 2022 +0800 atl: Avoid NULL pointer reference in AtlComModuleGetClassObject(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/atl/atl.c | 4 +-- dlls/atl100/tests/atl.c | 27 ++++++++++++++++++ dlls/atl110/tests/Makefile.in | 6 ++++ dlls/atl110/tests/atl.c | 65 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e563a2f9502..d60418ff60a 100755 --- a/configure +++ b/configure @@ -21227,6 +21227,7 @@ wine_fn_config_makefile dlls/atl/tests enable_tests wine_fn_config_makefile dlls/atl100 enable_atl100 wine_fn_config_makefile dlls/atl100/tests enable_tests wine_fn_config_makefile dlls/atl110 enable_atl110 +wine_fn_config_makefile dlls/atl110/tests enable_tests wine_fn_config_makefile dlls/atl80 enable_atl80 wine_fn_config_makefile dlls/atl80/tests enable_tests wine_fn_config_makefile dlls/atl90 enable_atl90 diff --git a/configure.ac b/configure.ac index d5791bab7b1..5ea0d9120f0 100644 --- a/configure.ac +++ b/configure.ac @@ -2394,6 +2394,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl/tests) WINE_CONFIG_MAKEFILE(dlls/atl100) WINE_CONFIG_MAKEFILE(dlls/atl100/tests) WINE_CONFIG_MAKEFILE(dlls/atl110) +WINE_CONFIG_MAKEFILE(dlls/atl110/tests) WINE_CONFIG_MAKEFILE(dlls/atl80) WINE_CONFIG_MAKEFILE(dlls/atl80/tests) WINE_CONFIG_MAKEFILE(dlls/atl90) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 87a24e33ed7..d501e7a6d76 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -482,7 +482,7 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, return E_INVALIDARG; for(iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) { - if(IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) { + if(*iter && IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) { if(!(*iter)->pCF) hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&(*iter)->pCF); if((*iter)->pCF) @@ -507,7 +507,7 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, return E_INVALIDARG; for(iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) { - if(IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) { + if(*iter && IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) { if(!(*iter)->pCache->pCF) hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&(*iter)->pCache->pCF); if((*iter)->pCache->pCF) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index e161878f8ea..e002af0d24c 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -1062,6 +1062,32 @@ static void test_AtlAxCreateControl(void) DestroyWindow(hwnd); } +static void test_AtlComModuleGetClassObject(void) +{ + _ATL_OBJMAP_ENTRY *null_entry = NULL; + _ATL_COM_MODULE module; + HRESULT hr; + void *ret; + + /* Test NULL module */ + hr = AtlComModuleGetClassObject(NULL, &GUID_NULL, &IID_NULL, &ret); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + /* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = NULL; + module.m_ppAutoObjMapLast = NULL; + hr = AtlComModuleGetClassObject(&module, &GUID_NULL, &IID_NULL, &ret); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr); + + /* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = &null_entry; + module.m_ppAutoObjMapLast = &null_entry; + hr = AtlComModuleGetClassObject(&module, &GUID_NULL, &IID_NULL, &ret); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr); +} + START_TEST(atl) { if (!register_class()) @@ -1077,6 +1103,7 @@ START_TEST(atl) test_ax_win(); test_AtlAxAttachControl(); test_AtlAxCreateControl(); + test_AtlComModuleGetClassObject(); CoUninitialize(); } diff --git a/dlls/atl110/tests/Makefile.in b/dlls/atl110/tests/Makefile.in new file mode 100644 index 00000000000..6374117e1be --- /dev/null +++ b/dlls/atl110/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = atl110.dll +IMPORTS = uuid ole32 atl110 +EXTRADEFS = -D_ATL_VER=_ATL_VER_110 + +C_SRCS = \ + atl.c diff --git a/dlls/atl110/tests/atl.c b/dlls/atl110/tests/atl.c new file mode 100644 index 00000000000..cb8f667596b --- /dev/null +++ b/dlls/atl110/tests/atl.c @@ -0,0 +1,65 @@ +/* + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * 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 <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <atlbase.h> + +#include <wine/test.h> + +static void test_AtlComModuleGetClassObject(void) +{ + _ATL_OBJMAP_ENTRY_EX *null_entry = NULL; + _ATL_COM_MODULE module; + HRESULT hr; + void *ret; + + /* Test NULL module */ + hr = AtlComModuleGetClassObject(NULL, &GUID_NULL, &IID_NULL, &ret); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + /* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = NULL; + module.m_ppAutoObjMapLast = NULL; + hr = AtlComModuleGetClassObject(&module, &GUID_NULL, &IID_NULL, &ret); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr); + + /* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = &null_entry; + module.m_ppAutoObjMapLast = &null_entry; + hr = AtlComModuleGetClassObject(&module, &GUID_NULL, &IID_NULL, &ret); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr); +} + +START_TEST(atl) +{ + CoInitialize(NULL); + + test_AtlComModuleGetClassObject(); + + CoUninitialize(); +}

1 0

Zhiyi Zhang : atl: Avoid NULL pointer reference in AtlComModuleRegisterClassObjects().
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: f4890dac17adbba96375c320cc50293949cc0eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4890dac17adbba96375c320… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 1 10:41:16 2022 +0800 atl: Avoid NULL pointer reference in AtlComModuleRegisterClassObjects(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/atl/atl.c | 4 ++-- dlls/atl100/tests/atl.c | 28 ++++++++++++++++++++++++++++ dlls/atl110/tests/atl.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index d501e7a6d76..5a302621d60 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -538,7 +538,7 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD c return E_INVALIDARG; for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { - if(!(*iter)->pfnGetClassObject) + if(!(*iter) || !(*iter)->pfnGetClassObject) continue; hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&unk); @@ -566,7 +566,7 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD c return E_INVALIDARG; for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { - if(!(*iter)->pfnGetClassObject) + if(!(*iter) || !(*iter)->pfnGetClassObject) continue; hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&unk); diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index e002af0d24c..7da6e5a9cd6 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -1088,6 +1088,33 @@ static void test_AtlComModuleGetClassObject(void) ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr); } +static void test_AtlComModuleRegisterClassObjects(void) +{ + _ATL_OBJMAP_ENTRY *null_entry = NULL; + _ATL_COM_MODULE module; + HRESULT hr; + + /* Test NULL module */ + hr = AtlComModuleRegisterClassObjects(NULL, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + /* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = NULL; + module.m_ppAutoObjMapLast = NULL; + hr = AtlComModuleRegisterClassObjects(&module, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); + todo_wine_if(hr == S_OK) + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + + /* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = &null_entry; + module.m_ppAutoObjMapLast = &null_entry; + hr = AtlComModuleRegisterClassObjects(&module, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); + todo_wine_if(hr == S_OK) + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); +} + START_TEST(atl) { if (!register_class()) @@ -1104,6 +1131,7 @@ START_TEST(atl) test_AtlAxAttachControl(); test_AtlAxCreateControl(); test_AtlComModuleGetClassObject(); + test_AtlComModuleRegisterClassObjects(); CoUninitialize(); } diff --git a/dlls/atl110/tests/atl.c b/dlls/atl110/tests/atl.c index cb8f667596b..9e4bad87e97 100644 --- a/dlls/atl110/tests/atl.c +++ b/dlls/atl110/tests/atl.c @@ -55,11 +55,39 @@ static void test_AtlComModuleGetClassObject(void) ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Unexpected hr %#lx.\n", hr); } +static void test_AtlComModuleRegisterClassObjects(void) +{ + _ATL_OBJMAP_ENTRY_EX *null_entry = NULL; + _ATL_COM_MODULE module; + HRESULT hr; + + /* Test NULL module */ + hr = AtlComModuleRegisterClassObjects(NULL, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + /* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = NULL; + module.m_ppAutoObjMapLast = NULL; + hr = AtlComModuleRegisterClassObjects(&module, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); + todo_wine_if(hr == S_OK) + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + + /* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = &null_entry; + module.m_ppAutoObjMapLast = &null_entry; + hr = AtlComModuleRegisterClassObjects(&module, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); + todo_wine_if(hr == S_OK) + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); +} + START_TEST(atl) { CoInitialize(NULL); test_AtlComModuleGetClassObject(); + test_AtlComModuleRegisterClassObjects(); CoUninitialize(); }

1 0

Zhiyi Zhang : atl: Avoid NULL pointer reference in AtlComModuleRevokeClassObjects().
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 2f3b916d05f6f2cd092f228645a0eb8bca5a1b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f3b916d05f6f2cd092f2286… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 1 12:31:34 2022 +0800 atl: Avoid NULL pointer reference in AtlComModuleRevokeClassObjects(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/atl/atl.c | 6 ++++++ dlls/atl100/tests/atl.c | 26 ++++++++++++++++++++++++++ dlls/atl110/tests/atl.c | 26 ++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 5a302621d60..32e0c722f8b 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -598,6 +598,9 @@ HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return E_INVALIDARG; for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + if(!(*iter)) + continue; + hres = CoRevokeClassObject((*iter)->dwRegister); if(FAILED(hres)) return hres; @@ -617,6 +620,9 @@ HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return E_INVALIDARG; for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + if(!(*iter)) + continue; + hres = CoRevokeClassObject((*iter)->pCache->dwRegister); if(FAILED(hres)) return hres; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 7da6e5a9cd6..a40c38df25a 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -1115,6 +1115,31 @@ static void test_AtlComModuleRegisterClassObjects(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); } +static void test_AtlComModuleRevokeClassObjects(void) +{ + _ATL_OBJMAP_ENTRY *null_entry = NULL; + _ATL_COM_MODULE module; + HRESULT hr; + + /* Test NULL module */ + hr = AtlComModuleRevokeClassObjects(NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + /* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = NULL; + module.m_ppAutoObjMapLast = NULL; + hr = AtlComModuleRevokeClassObjects(&module); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = &null_entry; + module.m_ppAutoObjMapLast = &null_entry; + hr = AtlComModuleRevokeClassObjects(&module); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); +} + START_TEST(atl) { if (!register_class()) @@ -1132,6 +1157,7 @@ START_TEST(atl) test_AtlAxCreateControl(); test_AtlComModuleGetClassObject(); test_AtlComModuleRegisterClassObjects(); + test_AtlComModuleRevokeClassObjects(); CoUninitialize(); } diff --git a/dlls/atl110/tests/atl.c b/dlls/atl110/tests/atl.c index 9e4bad87e97..ba5639178c3 100644 --- a/dlls/atl110/tests/atl.c +++ b/dlls/atl110/tests/atl.c @@ -82,12 +82,38 @@ static void test_AtlComModuleRegisterClassObjects(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); } +static void test_AtlComModuleRevokeClassObjects(void) +{ + _ATL_OBJMAP_ENTRY_EX *null_entry = NULL; + _ATL_COM_MODULE module; + HRESULT hr; + + /* Test NULL module */ + hr = AtlComModuleRevokeClassObjects(NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + /* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = NULL; + module.m_ppAutoObjMapLast = NULL; + hr = AtlComModuleRevokeClassObjects(&module); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = &null_entry; + module.m_ppAutoObjMapLast = &null_entry; + hr = AtlComModuleRevokeClassObjects(&module); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); +} + START_TEST(atl) { CoInitialize(NULL); test_AtlComModuleGetClassObject(); test_AtlComModuleRegisterClassObjects(); + test_AtlComModuleRevokeClassObjects(); CoUninitialize(); }

1 0

Zebediah Figura : d3d8/tests: Make getPixelColor() checks into actual ok() calls.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: dae1c93f5cc8c2f071fc22deaf2a95b1c7768195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae1c93f5cc8c2f071fc22de… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 7 03:46:04 2022 +0000 d3d8/tests: Make getPixelColor() checks into actual ok() calls. These should never fail. --- dlls/d3d8/tests/visual.c | 92 +++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fa0030b2187..bd600b44c2f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -114,56 +114,28 @@ static void get_rt_readback(IDirect3DSurface8 *surface, struct surface_readback hr = IDirect3DSurface8_GetDesc(surface, &desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateTexture(device, desc.Width, desc.Height, 1, 0, desc.Format, D3DPOOL_SYSTEMMEM, &tex); - if (FAILED(hr) || !tex) - { - trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr); - goto error; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &rb->surface); - if (FAILED(hr)) - { - trace("Can't get surface from texture, hr %#x.\n", hr); - goto error; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DDevice8_CopyRects(device, surface, NULL, 0, rb->surface, NULL); - if (FAILED(hr)) - { - trace("Can't read the render target, hr %#x.\n", hr); - goto error; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DSurface8_LockRect(rb->surface, &rb->locked_rect, NULL, D3DLOCK_READONLY); - if (FAILED(hr)) - { - trace("Can't lock the offscreen surface, hr %#x.\n", hr); - goto error; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); IDirect3DTexture8_Release(tex); IDirect3DDevice8_Release(device); - return; - -error: - if (rb->surface) - IDirect3DSurface8_Release(rb->surface); - rb->surface = NULL; - if (tex) - IDirect3DTexture8_Release(tex); - IDirect3DDevice8_Release(device); } static DWORD get_readback_color(struct surface_readback *rb, unsigned int x, unsigned int y) { - return rb->locked_rect.pBits - ? ((DWORD *)rb->locked_rect.pBits)[y * rb->locked_rect.Pitch / sizeof(DWORD) + x] : 0xdeadbeef; + return ((DWORD *)rb->locked_rect.pBits)[y * rb->locked_rect.Pitch / sizeof(DWORD) + x]; } static void release_surface_readback(struct surface_readback *rb) { HRESULT hr; - if (!rb->surface) - return; - if (rb->locked_rect.pBits && FAILED(hr = IDirect3DSurface8_UnlockRect(rb->surface))) - trace("Can't unlock the offscreen surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_UnlockRect(rb->surface); + ok(hr == S_OK, "Got hr %#x.\n", hr); IDirect3DSurface8_Release(rb->surface); } @@ -175,11 +147,7 @@ static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) HRESULT hr; hr = IDirect3DDevice8_GetRenderTarget(device, &rt); - if (FAILED(hr)) - { - trace("Can't get the render target, hr %#x.\n", hr); - return 0xdeadbeef; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); get_rt_readback(rt, &rb); /* Remove the X channel for now. DirectX and OpenGL have different ideas how to treat it apparently, and it isn't @@ -6812,6 +6780,7 @@ done: static void test_updatetexture(void) { + D3DADAPTER_IDENTIFIER8 identifier; IDirect3DDevice8 *device; IDirect3D8 *d3d; HWND window; @@ -6922,6 +6891,8 @@ static void test_updatetexture(void) return; } + hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); @@ -7110,6 +7081,11 @@ static void test_updatetexture(void) if (do_visual_test) { + IDirect3DTexture8 *rb_texture; + struct surface_readback rb; + IDirect3DSurface8 *rt; + D3DSURFACE_DESC desc; + hr = IDirect3DDevice8_SetTexture(device, 0, dst); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); @@ -7124,10 +7100,38 @@ static void test_updatetexture(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken_result) - || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ - "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); + /* Read back manually. WARP often completely breaks down with + * these draws and fails to copy to the staging texture. */ + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirect3DSurface8_GetDesc(rt, &desc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, desc.Width, desc.Height, + 1, 0, desc.Format, D3DPOOL_SYSTEMMEM, &rb_texture); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(rb_texture, 0, &rb.surface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, rt, NULL, 0, rb.surface, NULL); + ok(hr == S_OK || broken(adapter_is_warp(&identifier)), "Got hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface8_LockRect(rb.surface, &rb.locked_rect, NULL, D3DLOCK_READONLY); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + color = get_readback_color(&rb, 320, 240) & 0x00ffffff; + ok(color_match(color, 0x007f7f00, 3) || broken(tests[i].broken_result), + "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); + + hr = IDirect3DSurface8_UnlockRect(rb.surface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + + IDirect3DSurface8_Release(rb.surface); + IDirect3DTexture8_Release(rb_texture); + IDirect3DSurface8_Release(rt); } IDirect3DBaseTexture8_Release(src);

1 0

Zebediah Figura : d3d8/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 43f23d3e63f3943b286400b151a1ff4adc9250b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f23d3e63f3943b286400b1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 7 03:46:05 2022 +0000 d3d8/tests: Build without -DWINE_NO_LONG_TYPES. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/device.c | 2538 ++++++++++++++++---------------- dlls/d3d8/tests/stateblock.c | 118 +- dlls/d3d8/tests/visual.c | 3278 +++++++++++++++++++++--------------------- dlls/d3d9/tests/d3d9ex.c | 3 +- 5 files changed, 2942 insertions(+), 2996 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43f23d3e63f3943b2864…

1 0

Rémi Bernon : win32u: Fix NtUserChangeDisplaySettings comment.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 566dd3af36f3c23cf25f91180297e81c3e219b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=566dd3af36f3c23cf25f9118… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 7 09:46:01 2022 +0200 win32u: Fix NtUserChangeDisplaySettings comment. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index fa82566e24c..061cfa9f0a9 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1835,7 +1835,7 @@ static BOOL is_detached_mode( const DEVMODEW *mode ) } /*********************************************************************** - * NtUserChangeDisplaySettingsExW (win32u.@) + * NtUserChangeDisplaySettings (win32u.@) */ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam )

1 0