March 2020 - Wine-Commits - list.winehq.org

Jacek Caban : dbghelp: Support GNU debug link and build id in PE files.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 0dd495868846f30d9bb8f15f389d2b1ff6f383cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd495868846f30d9bb8f15f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 17:21:45 2020 +0100 dbghelp: Support GNU debug link and build id in PE files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/pe_module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 17db805515..8c120e00dc 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -723,7 +723,8 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module) if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { - ret = pe_load_stabs(pcs, module); + ret = image_check_alternate(&module->format_info[DFI_PE]->u.pe_info->fmap, module); + ret = pe_load_stabs(pcs, module) || ret; ret = pe_load_dwarf(module) || ret; ret = pe_load_msc_debug_info(pcs, module) || ret; ret = ret || pe_load_coff_symbol_table(module); /* FIXME */

1 0

Jacek Caban : dbghelp: Support PE debug link files.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 2642f43eabe6c61341daee24487372b57723894d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2642f43eabe6c61341daee24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 17:21:58 2020 +0100 dbghelp: Support PE debug link files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/module.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index a219427d46..2e1d9299e5 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -136,6 +136,7 @@ struct image_section_map BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN; BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) DECLSPEC_HIDDEN; +BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) DECLSPEC_HIDDEN; struct image_file_map_ops { diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 32cb1caf32..9c8fb662f0 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -540,8 +540,10 @@ static BOOL refresh_module_list(struct process* pcs) static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) { + DWORD read_bytes; HANDLE handle; WCHAR *path; + WORD magic; BOOL ret; path = get_dos_file_name(file); @@ -560,7 +562,11 @@ static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fma } } - ret = elf_map_handle(handle, fmap); + SetFilePointer(handle, 0, 0, FILE_BEGIN); + if (ReadFile(handle, &magic, sizeof(magic), &read_bytes, NULL) && magic == IMAGE_DOS_SIGNATURE) + ret = pe_map_file(handle, fmap, DMT_PE); + else + ret = elf_map_handle(handle, fmap); CloseHandle(handle); return ret; }

1 0

Serge Gautherie : advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 9cc8b501eea8dc3bd589ab3e5df3b750e43699d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cc8b501eea8dc3bd589ab3e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Mar 17 14:47:57 2020 +0100 advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 6 +++--- include/wincrypt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385299..14acceb100 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -647,18 +647,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index f8e985da1b..28bebf8dc4 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3922,7 +3922,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, const BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, const BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);

1 0

Serge Gautherie : advapi32: Use standard refcount in CRYPTPROV.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 62df03af96822bda36aef398d00bf5998f490e90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62df03af96822bda36aef398… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Mar 17 14:48:17 2020 +0100 advapi32: Use standard refcount in CRYPTPROV. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 5 ++--- dlls/advapi32/crypt.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 14acceb100..f49a4973d7 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -636,7 +636,7 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl return FALSE; } - pProv->refcount++; + InterlockedIncrement(&pProv->refcount); return TRUE; } @@ -672,8 +672,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) return FALSE; } - pProv->refcount--; - if (pProv->refcount <= 0) + if (InterlockedDecrement(&pProv->refcount) == 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index afee3e2e29..a4429642d2 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -63,7 +63,7 @@ typedef struct tagPROVFUNCS typedef struct tagCRYPTPROV { DWORD dwMagic; - UINT refcount; + LONG refcount; HMODULE hModule; PPROVFUNCS pFuncs; HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/

1 0

Serge Gautherie : advapi32: Fix CryptReleaseContext() last error on NULL provider.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 8b9e3dae4fb875d6a445bd5182bb6ae32f5680c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9e3dae4fb875d6a445bd51… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Mar 17 14:48:41 2020 +0100 advapi32: Fix CryptReleaseContext() last error on NULL provider. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f49a4973d7..c4f69886d0 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -662,7 +662,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) if (!pProv) { - SetLastError(NTE_BAD_UID); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }

1 0

Jacek Caban : ucrtbase/tests: Use public onexit table declarations.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: aa16d0adf1aaa75e1e9c052786a18864ac07f91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa16d0adf1aaa75e1e9c0527… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:01:37 2020 +0100 ucrtbase/tests: Use public onexit table declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 88 +++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa16d0adf1aaa75e1e9c…

1 0

Jacek Caban : ucrtbase/tests: Fix clock tests.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: 618b0736fecd1367067a0b702361ab01ccb25d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=618b0736fecd1367067a0b70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:55:24 2020 +0100 ucrtbase/tests: Fix clock tests. crt_init_start no longer makes sense since ucrtbase.dll is directly linked to test executable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index ada3a52eb6..46389edf25 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -131,7 +131,7 @@ typedef struct { typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); static HMODULE module; -static LONGLONG crt_init_start, crt_init_end; +static LONGLONG crt_init_end; static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); @@ -485,16 +485,10 @@ static BOOL init(void) { FILETIME cur; - GetSystemTimeAsFileTime(&cur); - crt_init_start = ((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime; - module = LoadLibraryA("ucrtbase.dll"); GetSystemTimeAsFileTime(&cur); crt_init_end = ((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime; - if(!module) { - win_skip("ucrtbase.dll not available\n"); - return FALSE; - } + module = GetModuleHandleW(L"ucrtbase.dll"); p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); @@ -1384,17 +1378,16 @@ static void test__o_malloc(void) static void test_clock(void) { - static const int thresh = 100; - int c, expect_min, expect_max; + static const int thresh = 100, max_load_delay = 1000; + int c, expect_min; FILETIME cur; GetSystemTimeAsFileTime(&cur); c = clock(); expect_min = (((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime - crt_init_end) / 10000; - expect_max = (((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime - crt_init_start) / 10000; - ok(c > expect_min-thresh && c < expect_max+thresh, "clock() = %d, expected range [%d, %d]\n", - c, expect_min, expect_max); + ok(c >= expect_min - thresh && c < expect_min + max_load_delay, "clock() = %d, expected range [%d, %d]\n", + c, expect_min - thresh, expect_min + max_load_delay); } START_TEST(misc)

1 0

Connor McAdams : d2d1: Make sure arc fill vertex buffer has correct BindFlag.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: b2d1d1694da76820abf5efb616d5bbf2253d3aaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d1d1694da76820abf5efb6… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Mon Mar 16 14:06:59 2020 -0400 d2d1: Make sure arc fill vertex buffer has correct BindFlag. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index c3decf6fbd..146f7009da 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1008,6 +1008,7 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t if (geometry->fill.arc_vertex_count) { buffer_desc.ByteWidth = geometry->fill.arc_vertex_count * sizeof(*geometry->fill.arc_vertices); + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.arc_vertices; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb)))

1 0

Hans Leidekker : webservices: Use wide character string literals.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: e1b74133b89ae3c63e0cd2fa7be4831647529288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1b74133b89ae3c63e0cd2fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:42 2020 +0100 webservices: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 7 ++----- dlls/webservices/listener.c | 3 +-- dlls/webservices/msg.c | 25 +++++++------------------ dlls/webservices/url.c | 41 +++++++++++++++++------------------------ 4 files changed, 27 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1b74133b89ae3c63e0c…

1 0

Hans Leidekker : webservices/tests: Use wide character string literals.
by Alexandre Julliard March 17, 2020

March 17, 2020

Module: wine Branch: master Commit: f735ffbfe29cdd9763fe4c0575d8bd1ca616341c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f735ffbfe29cdd9763fe4c05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:43 2020 +0100 webservices/tests: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 51 ++++------- dlls/webservices/tests/msg.c | 34 +++----- dlls/webservices/tests/proxy.c | 28 +++--- dlls/webservices/tests/reader.c | 57 +++++-------- dlls/webservices/tests/url.c | 178 +++++++++++++++++---------------------- dlls/webservices/tests/writer.c | 77 +++++++---------- 6 files changed, 172 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f735ffbfe29cdd9763fe…

1 0