October 2021 - Wine-commits

Nikolay Sivov : gdi32: Enumerate scalable fonts with zero charset mask as OEM.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 499448fb21bbcd85a3bd224edc280c5ab57d4a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=499448fb21bbcd85a3bd224e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 28 00:03:51 2021 +0300 gdi32: Enumerate scalable fonts with zero charset mask as OEM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51041 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8241d21ae0d385bb436930320056d16a8906caf5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 814c6153b89..b6840d8d809 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2816,7 +2816,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi for (i = 0; i < count; i++) { - if (!face->scalable && face->fs.fsCsb[0] == 0) /* OEM bitmap */ + if (face->fs.fsCsb[0] == 0) /* OEM */ { elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; load_script_name( IDS_OEM_DOS - IDS_FIRST_SCRIPT, elf.elfScript );

1 0

Piotr Caban : msvcrt/tests: Link to malloc/free functions in cpp tests.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 53ee588abb519036ed951dddba797a7298d7bd3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ee588abb519036ed951ddd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 30 20:50:47 2021 +0200 msvcrt/tests: Link to malloc/free functions in cpp tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d7cc3d6583bade120639d30cbc374692731858d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 07b49ae755d..24e50196035 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -44,12 +44,8 @@ typedef struct __type_info #endif /* Function pointers. We need to use these to call these funcs as __thiscall */ -static HMODULE hMsvcrt; - -static void* (__cdecl *poperator_new)(unsigned int); +static void* (__cdecl *poperator_new)(size_t); static void (__cdecl *poperator_delete)(void*); -static void* (__cdecl *pmalloc)(unsigned int); -static void (__cdecl *pfree)(void*); /* exception */ static void (__thiscall *pexception_ctor)(exception*,LPCSTR*); @@ -157,23 +153,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ /* Some exports are only available in later versions */ -#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hmsvcrt,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL InitFunctionPtrs(void) { - hMsvcrt = GetModuleHandleA("msvcrt.dll"); - if (!hMsvcrt) - hMsvcrt = GetModuleHandleA("msvcrtd.dll"); - ok(hMsvcrt != 0, "GetModuleHandleA failed\n"); - if (!hMsvcrt) - { - win_skip("Could not load msvcrt.dll\n"); - return FALSE; - } - - SET(pmalloc, "malloc"); - SET(pfree, "free"); + HMODULE hmsvcrt = GetModuleHandleA("msvcrt.dll"); SET(pexception_vtable, "??_7exception@@6B@"); SET(pbad_typeid_vtable, "??_7bad_typeid@@6B@"); @@ -338,9 +323,9 @@ static BOOL InitFunctionPtrs(void) } if (!poperator_new) - poperator_new = pmalloc; + poperator_new = malloc; if (!poperator_delete) - poperator_delete = pfree; + poperator_delete = free; init_thiscall_thunk(); return TRUE; @@ -818,14 +803,14 @@ static void test_type_info(void) char* name; int res; - if (!pmalloc || !pfree || !ptype_info_dtor || !ptype_info_raw_name || + if (!ptype_info_dtor || !ptype_info_raw_name || !ptype_info_name || !ptype_info_before || !ptype_info_opequals_equals || !ptype_info_opnot_equals) return; /* Test calling the dtors */ call_func1(ptype_info_dtor, &t1); /* No effect, since name is NULL */ - t1.name = pmalloc(64); + t1.name = malloc(64); strcpy(t1.name, "foo"); call_func1(ptype_info_dtor, &t1); /* Frees t1.name using 'free' */ @@ -1112,11 +1097,11 @@ static void test_demangle_datatype(void) for (i = 0; i < num_test; i++) { - name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800); + name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); if(name) - pfree(name); + free(name); } } @@ -1331,7 +1316,7 @@ static void test_demangle(void) for (i = 0; i < num_test; i++) { - name = p__unDName(0, test[i].in, 0, pmalloc, pfree, test[i].flags); + name = p__unDName(0, test[i].in, 0, malloc, free, test[i].flags); ok(name != NULL, "%u: unDName failed\n", i); if (!name) continue; ok( !strcmp_space(test[i].out, name) || @@ -1340,7 +1325,7 @@ static void test_demangle(void) ok( !strcmp_space(test[i].out, name) || broken(test[i].broken && !strcmp_space(test[i].broken, name)), "%u: Expected \"%s\"\n", i, test[i].out ); - pfree(name); + free(name); } }

1 0

Piotr Caban : msvcrt/tests: Cleanup datatype demangle tests.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 737adb2684d83bc00dbcac78fb5fd7afba81c649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=737adb2684d83bc00dbcac78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 30 20:50:56 2021 +0200 msvcrt/tests: Cleanup datatype demangle tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d91160835ad7a5aa08b8e2ca7a1715aaef72045b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 24e50196035..4d3a5f8d96f 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1084,20 +1084,24 @@ static void test_demangle_datatype(void) { char * name; struct _demangle demangle[]={ -/* { "BlaBla"," ?? ::Bla", FALSE}, */ - { "ABVVec4(a)ref2@dice@@","class dice::ref2::Vec4 const &",TRUE}, - { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0H@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,7>", TRUE}, - { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HO@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,126>",TRUE}, - { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HOA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,2016>",TRUE}, - { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HOAA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, - { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, -/* { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$011@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$011@@@",FALSE}, */ + { "BlaBla"," ?? ::Bla", FALSE}, + { "ABVVec4(a)ref2@dice@@", "class dice::ref2::Vec4 const &", TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0H@@@", + "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,7>", TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HO@@@", + "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,126>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HOA@@@", + "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,2016>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HOAA@@@", + "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", + "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, }; int i, num_test = ARRAY_SIZE(demangle); for (i = 0; i < num_test; i++) { - name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); + name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); if(name)

1 0

Piotr Caban : msvcrt: Fix _unDName crash when demangling class function pointer.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 1d23985d6407746141ace4d160f94452a755ce00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d23985d6407746141ace4d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 30 20:50:59 2021 +0200 msvcrt: Fix _unDName crash when demangling class function pointer. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7a1e7cbeee94756f3c474ba63b9fe9db8bddde3a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 ++ dlls/msvcrt/undname.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 4d3a5f8d96f..5eef5bdd93c 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1096,6 +1096,8 @@ static void test_demangle_datatype(void) "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, + { "P8test@@AACXZ", "signed char (__cdecl test::*)(void)", TRUE}, + { "P8test@@BACXZ", "signed char (__cdecl test::*)(void)const ", TRUE}, }; int i, num_test = ARRAY_SIZE(demangle); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 51ce1d25665..a8e2ef2bd08 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -879,7 +879,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, goto done; if (modifier) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); - else if(ptr_modif[0]) + else if(ptr_modif) modifier = str_printf(sym, " %s", ptr_modif); if (!get_calling_convention(*sym->current++, &call_conv, &exported,

1 0

Qian Hong : atl: Implement AtlAxDialogBox().
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 1abbaaa221ce79426c8270384bf6d6b7d026ce18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1abbaaa221ce79426c827038… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat May 1 21:47:55 2021 -0500 atl: Implement AtlAxDialogBox(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32749 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f987d8ac3b6bf2fb027196162985477c8daf27d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl/atl_ax.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 69d42f55813..fe70d0a3229 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1404,22 +1404,52 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) * AtlAxDialogBoxW [atl100.35] * */ -INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE instance, const WCHAR *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + HRSRC resource; + HGLOBAL global; + DLGTEMPLATE *template; + INT_PTR ret; + + TRACE("instance %p, name %s, owner %p, proc %p, param %#Ix\n", + instance, debugstr_w(name), owner, proc, param); + + if (!(resource = FindResourceW(instance, name, (const WCHAR *)RT_DIALOG))) + return 0; + + if (!(global = LoadResource(instance, resource))) + return 0; + + if (!(template = AX_ConvertDialogTemplate(LockResource(global)))) + return 0; + + ret = DialogBoxIndirectParamW(instance, template, owner, proc, param); + HeapFree(GetProcessHeap(), 0, template); + return ret; } /*********************************************************************** * AtlAxDialogBoxA [atl100.36] * */ -INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE instance, const char *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + WCHAR *nameW; + int len; + INT_PTR ret; + + if (IS_INTRESOURCE(name)) + return AtlAxDialogBoxW(instance, (const WCHAR *)name, owner, proc, param); + + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + if (!(nameW = malloc(len * sizeof(WCHAR)))) + return 0; + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + ret = AtlAxDialogBoxW(instance, nameW, owner, proc, param); + free(nameW); + return ret; } /***********************************************************************

1 0

Sebastian Lackner : ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 717e8d5366468326302f0dcaeea0670adf917324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717e8d5366468326302f0dca… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 4 18:05:00 2021 -0600 ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 43de1407e92296882c9c04e095f141a5df968808) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/file.c | 1 - dlls/ntdll/unix/file.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2507437c8c3..839046a7488 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -171,7 +171,6 @@ static void create_file_test(void) U(io).Status = 0xdeadbeef; offset.QuadPart = 0; status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL ); - todo_wine ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status ); if (status == STATUS_PENDING) { diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 014beacb35f..18e9a10252a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -344,7 +344,7 @@ NTSTATUS errno_to_status( int err ) case EACCES: return STATUS_ACCESS_DENIED; case ENOTDIR: return STATUS_OBJECT_PATH_NOT_FOUND; case ENOENT: return STATUS_OBJECT_NAME_NOT_FOUND; - case EISDIR: return STATUS_FILE_IS_A_DIRECTORY; + case EISDIR: return STATUS_INVALID_DEVICE_REQUEST; case EMFILE: case ENFILE: return STATUS_TOO_MANY_OPENED_FILES; case EINVAL: return STATUS_INVALID_PARAMETER;

1 0

Louis Lenders : advapi32: Add stub for LsaEnumerateAccounts.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 1b64d29849a879b4dff3b776c84d7e2b6a8d797e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b64d29849a879b4dff3b776… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri May 7 09:28:30 2021 +0200 advapi32: Add stub for LsaEnumerateAccounts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50830 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c74508d22528548940db3c8ac6a350064ca445e9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 16 ++++++++++++++++ include/ntlsa.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d5235c6adb9..8042ae9675e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -452,7 +452,7 @@ @ stub LsaDelete @ stdcall LsaDeleteTrustedDomain(ptr ptr) @ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) -@ stub LsaEnumerateAccounts +@ stdcall LsaEnumerateAccounts(ptr ptr ptr long ptr) @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) @ stub LsaEnumeratePrivileges @ stub LsaEnumeratePrivilegesOfAccount diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 55e42400c6d..7b118733b50 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -236,6 +236,22 @@ NTSTATUS WINAPI LsaEnumerateAccountRights( return STATUS_OBJECT_NAME_NOT_FOUND; } +/****************************************************************************** + * LsaEnumerateAccounts [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaEnumerateAccounts( + LSA_HANDLE policy, + PLSA_ENUMERATION_HANDLE context, + PVOID *buffer, + ULONG maxlen, + PULONG count) +{ + FIXME("(%p,%p,%p,%d,%p) stub\n", policy, context, buffer, maxlen, count); + if (count) *count = 0; + return STATUS_NO_MORE_ENTRIES; +} + /****************************************************************************** * LsaEnumerateAccountsWithUserRight [ADVAPI32.@] * diff --git a/include/ntlsa.h b/include/ntlsa.h index ca864f6356c..9a0cf378c50 100644 --- a/include/ntlsa.h +++ b/include/ntlsa.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +NTSTATUS WINAPI LsaEnumerateAccounts(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE policy, LSA_UNICODE_STRING *name, LSA_UNICODE_STRING **display_name, SHORT *language); NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Louis Lenders : kernel32: Remove entry for BasepDebugDump.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 360ce18577ff6008520da8172ad3e06218feb3a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360ce18577ff6008520da817… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon May 10 12:40:57 2021 +0200 kernel32: Remove entry for BasepDebugDump. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51117 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7aba0e541e5788ba59f993b58029be8c796ce31d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ee2e3f8ad31..0db29dd3515 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -191,7 +191,6 @@ # @ stub BasepCheckAppCompat # @ stub BasepCheckBadapp # @ stub BasepCheckWinSaferRestrictions -@ stub BasepDebugDump # @ stub BasepFreeActivationContextActivationBlock # @ stub BasepFreeAppCompatData # @ stub BasepMapModuleHandle

1 0

Francois Gouget : tests: Trace the filename in winetest_wait_child_process().
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 0aabd08c53807008e47649d04bf43100d1b9d7e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aabd08c53807008e47649d0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:11:49 2021 +0100 tests: Trace the filename in winetest_wait_child_process(). We want the filename next to the line number, just like in every other trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 092130e2aa53bce72c2a38cb90906c6c01c4867d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 787fea0ba24..c10050012b6 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -507,14 +507,14 @@ void winetest_wait_child_process( HANDLE process ) { DWORD pid = GetProcessId( process ); printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", - current_test->name, data->current_line, winetest_elapsed(), + data->current_file, data->current_line, winetest_elapsed(), exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { printf( "%s:%d:%s %u failures in child process\n", - current_test->name, data->current_line, winetest_elapsed(), + data->current_file, data->current_line, winetest_elapsed(), exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures);

1 0

Francois Gouget : tests: Add ignore_exceptions().
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 598a21be9cabd215d0d595b0ca768b795e321f8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=598a21be9cabd215d0d595b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:14:29 2021 +0100 tests: Add ignore_exceptions(). This lets tests signal that for a while exceptions are expected and should not be counted as test failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4ac37c4e24cf980717a982c22076cc4a5adffdd5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/test.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index c10050012b6..078b0147c4f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -61,6 +61,7 @@ extern const char *winetest_platform; extern void winetest_set_location( const char* file, int line ); extern void winetest_subtest( const char* name ); +extern void winetest_ignore_exceptions( BOOL ignore ); extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); extern void winetest_end_todo(void); @@ -97,6 +98,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #ifdef WINETEST_NO_LINE_NUMBERS # define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions # define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip @@ -104,6 +106,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT # define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process #else # define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ignore_exceptions # define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip @@ -112,6 +115,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #endif #define subtest subtest_(__FILE__, __LINE__) +#define ignore_exceptions ignore_exceptions_(__FILE__, __LINE__) #define ok ok_(__FILE__, __LINE__) #define skip skip_(__FILE__, __LINE__) #define win_skip win_skip_(__FILE__, __LINE__) @@ -298,6 +302,14 @@ void winetest_subtest( const char* name ) data->current_file, data->current_line, winetest_elapsed(), name ); } +void winetest_ignore_exceptions( BOOL ignore ) +{ + struct tls_data *data = get_tls_data(); + printf( "%s:%d:%s IgnoreExceptions=%d\n", + data->current_file, data->current_line, winetest_elapsed(), + ignore ? 1 : 0 ); +} + int broken( int condition ) { return (strcmp(winetest_platform, "windows") == 0) && condition;

1 0