June 2018 - Wine-commits - list.winehq.org

Zebediah Figura : msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: 0c216b8ca88cfe1b4c116867acd00c0978aa15c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c216b8ca88cfe1b4c116867… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 1 12:03:22 2018 -0500 msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 12 +----------- dlls/msvcrt/except_i386.c | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..4857d29 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,7 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..ee12fb6 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,22 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl $1\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr )

1 0

Fabian Maurer : fc: Add stub program.
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: 96a616577622cdc0ad04beea3cb21e3b21b6b339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96a616577622cdc0ad04beea… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu May 31 21:55:48 2018 +0200 fc: Add stub program. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/fc/Makefile.in | 4 ++++ programs/fc/fc.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/configure b/configure index 2960b34..6046fe6 100755 --- a/configure +++ b/configure @@ -1672,6 +1672,7 @@ enable_eject enable_expand enable_explorer enable_extrac32 +enable_fc enable_findstr enable_fsutil enable_hh @@ -19373,6 +19374,7 @@ wine_fn_config_makefile programs/eject enable_eject wine_fn_config_makefile programs/expand enable_expand wine_fn_config_makefile programs/explorer enable_explorer wine_fn_config_makefile programs/extrac32 enable_extrac32 +wine_fn_config_makefile programs/fc enable_fc wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil wine_fn_config_makefile programs/hh enable_hh diff --git a/configure.ac b/configure.ac index 3a6a3a1..a9fffc1 100644 --- a/configure.ac +++ b/configure.ac @@ -3875,6 +3875,7 @@ WINE_CONFIG_MAKEFILE(programs/eject) WINE_CONFIG_MAKEFILE(programs/expand) WINE_CONFIG_MAKEFILE(programs/explorer) WINE_CONFIG_MAKEFILE(programs/extrac32) +WINE_CONFIG_MAKEFILE(programs/fc) WINE_CONFIG_MAKEFILE(programs/findstr) WINE_CONFIG_MAKEFILE(programs/fsutil) WINE_CONFIG_MAKEFILE(programs/hh) diff --git a/programs/fc/Makefile.in b/programs/fc/Makefile.in new file mode 100644 index 0000000..96d878a --- /dev/null +++ b/programs/fc/Makefile.in @@ -0,0 +1,4 @@ +MODULE = fc.exe +APPMODE = -mconsole -municode + +C_SRCS = fc.c diff --git a/programs/fc/fc.c b/programs/fc/fc.c new file mode 100644 index 0000000..ba3b04b --- /dev/null +++ b/programs/fc/fc.c @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fc); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Fabian Maurer : find: Add stub program.
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: 914d387214ccbaaddcfeb14b5c159d1c969c852e URL: https://source.winehq.org/git/wine.git/?a=commit;h=914d387214ccbaaddcfeb14b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu May 31 21:55:49 2018 +0200 find: Add stub program. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/find/Makefile.in | 4 ++++ programs/find/find.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/configure b/configure index 6046fe6..456304b 100755 --- a/configure +++ b/configure @@ -1673,6 +1673,7 @@ enable_expand enable_explorer enable_extrac32 enable_fc +enable_find enable_findstr enable_fsutil enable_hh @@ -19375,6 +19376,7 @@ wine_fn_config_makefile programs/expand enable_expand wine_fn_config_makefile programs/explorer enable_explorer wine_fn_config_makefile programs/extrac32 enable_extrac32 wine_fn_config_makefile programs/fc enable_fc +wine_fn_config_makefile programs/find enable_find wine_fn_config_makefile programs/findstr enable_findstr wine_fn_config_makefile programs/fsutil enable_fsutil wine_fn_config_makefile programs/hh enable_hh diff --git a/configure.ac b/configure.ac index a9fffc1..600cb63 100644 --- a/configure.ac +++ b/configure.ac @@ -3876,6 +3876,7 @@ WINE_CONFIG_MAKEFILE(programs/expand) WINE_CONFIG_MAKEFILE(programs/explorer) WINE_CONFIG_MAKEFILE(programs/extrac32) WINE_CONFIG_MAKEFILE(programs/fc) +WINE_CONFIG_MAKEFILE(programs/find) WINE_CONFIG_MAKEFILE(programs/findstr) WINE_CONFIG_MAKEFILE(programs/fsutil) WINE_CONFIG_MAKEFILE(programs/hh) diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in new file mode 100644 index 0000000..ef8d61b --- /dev/null +++ b/programs/find/Makefile.in @@ -0,0 +1,4 @@ +MODULE = find.exe +APPMODE = -mconsole -municode + +C_SRCS = find.c diff --git a/programs/find/find.c b/programs/find/find.c new file mode 100644 index 0000000..9d7aecd --- /dev/null +++ b/programs/find/find.c @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(find); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Stefan Leichter : ntdll: Partly implement RtlDosPathNameToRelativeNtPathName_U_WithStatus.
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: bbfc01ccdcf887b76a1f22c79aa5d42a7fdc5a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfc01ccdcf887b76a1f22c7… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu May 31 17:15:35 2018 +0200 ntdll: Partly implement RtlDosPathNameToRelativeNtPathName_U_WithStatus. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/path.c | 21 +++++++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 29 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 66d4e7c..c0f5d6f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -564,6 +564,7 @@ # @ stub RtlDosApplyFileIsolationRedirection_Ustr @ stdcall RtlDosPathNameToNtPathName_U(wstr ptr ptr ptr) @ stdcall RtlDosPathNameToNtPathName_U_WithStatus(wstr ptr ptr ptr) +@ stdcall RtlDosPathNameToRelativeNtPathName_U_WithStatus(wstr ptr ptr ptr) @ stdcall RtlDosSearchPath_U(wstr wstr wstr long ptr ptr) # @ stub RtlDosSearchPath_Ustr @ stdcall RtlDowncaseUnicodeChar(long) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 3062787..0533946 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -436,6 +436,27 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, return RtlDosPathNameToNtPathName_U_WithStatus(dos_path, ntpath, file_part, cd) == STATUS_SUCCESS; } +/************************************************************************** + * RtlDosPathNameToRelativeNtPathName_U_WithStatus [NTDLL.@] + * + * See RtlDosPathNameToNtPathName_U_WithStatus (except the last parameter) + */ +NTSTATUS WINAPI RtlDosPathNameToRelativeNtPathName_U_WithStatus(const WCHAR *dos_path, + UNICODE_STRING *ntpath, WCHAR **file_part, RTL_RELATIVE_NAME *relative) +{ + TRACE("(%s,%p,%p,%p)\n", debugstr_w(dos_path), ntpath, file_part, relative); + + if (relative) + { + FIXME("Unsupported parameter\n"); + memset(relative, 0, sizeof(*relative)); + } + + /* FIXME: fill parameter relative */ + + return RtlDosPathNameToNtPathName_U_WithStatus(dos_path, ntpath, file_part, NULL); +} + /****************************************************************** * RtlDosSearchPath_U * diff --git a/include/winternl.h b/include/winternl.h index 9452f8c..3ecd068 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -148,6 +148,13 @@ typedef struct RTL_DRIVE_LETTER_CURDIR UNICODE_STRING DosPath; } RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR; +typedef struct _RTL_RELATIVE_NAME +{ + UNICODE_STRING RelativeName; + HANDLE ContainerDirectory; + void *CurDirRef; +} RTL_RELATIVE_NAME, *PRTL_RELATIVE_NAME; + typedef struct tagRTL_BITMAP { ULONG SizeOfBitMap; /* Number of bits in the bitmap */ PULONG Buffer; /* Bitmap data, assumed sized to a DWORD boundary */

1 0

Alex Henrie : gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity).
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: e3648c7a61a459dbe142b4e12281c1a47c1905d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3648c7a61a459dbe142b4e1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 31 23:03:35 2018 -0600 gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17b160d..41ec07d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2823,6 +2823,7 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, UINT cp; int len; char mbchs[2]; + WCHAR wChar; cp = GdiGetCodePage(hdc); if (IsDBCSLeadByteEx(cp, uChar >> 8)) { @@ -2833,8 +2834,9 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - uChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + wChar = 0; + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); + uChar = wChar; } return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer,

1 0

Michael Stefaniuc : wbemprox/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: 847693558f6cffba3dee15d33e5daf4661a03b1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=847693558f6cffba3dee15d3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:33 2018 +0200 wbemprox/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 10 +++++----- dlls/wbemprox/tests/services.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d95fdd9..cb911d7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -141,7 +141,7 @@ static void test_select( IWbemServices *services ) hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); @@ -168,7 +168,7 @@ static void test_associators( IWbemServices *services ) IEnumWbemClassObject *result; UINT i; - for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); @@ -433,7 +433,7 @@ static void test_Win32_Process( IWbemServices *services ) out = NULL; method = SysAllocString( getownerW ); - class = SysAllocStringLen( NULL, sizeof(fmtW)/sizeof(fmtW[0]) + 10 ); + class = SysAllocStringLen( NULL, ARRAY_SIZE( fmtW ) + 10 ); wsprintfW( class, fmtW, GetCurrentProcessId() ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); ok( hr == S_OK, "failed to execute method %08x\n", hr ); @@ -524,13 +524,13 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) WCHAR username[128]; DWORD len, count; - len = sizeof(compname) / sizeof(compname[0]); + len = ARRAY_SIZE( compname ); if (!GetComputerNameW( compname, &len )) compname[0] = 0; lstrcpyW( username, compname ); lstrcatW( username, backslashW ); - len = sizeof(username) / sizeof(username[0]) - lstrlenW( username ); + len = ARRAY_SIZE( username ) - lstrlenW( username ); if (!GetUserNameW( username + lstrlenW( username ), &len )) username[0] = 0; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index a6774751..da10e72 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -164,7 +164,7 @@ static void test_IWbemLocator(void) } ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); - for (i = 0; i < sizeof(test) / sizeof(test[0]); i++) + for (i = 0; i < ARRAY_SIZE( test ); i++) { resource = SysAllocString( test[i].path ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services );

1 0

Michael Stefaniuc : wbemdisp/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: 8261609197ed345a5e50d06420e90bedc1a4d42a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8261609197ed345a5e50d064… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:34 2018 +0200 wbemdisp/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/tests/wbemdisp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 0c426c5..171a91e 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -56,10 +56,10 @@ static void test_ParseDisplayName(void) ULONG eaten; } tests[] = { - { name1, S_OK, &IID_ISWbemServices, sizeof(name1)/sizeof(name1[0]) - 1 }, - { name2, S_OK, &IID_ISWbemServices, sizeof(name2)/sizeof(name2[0]) - 1 }, - { name3, S_OK, &IID_ISWbemObject, sizeof(name3)/sizeof(name3[0]) - 1 }, - { name4, S_OK, &IID_ISWbemObject, sizeof(name4)/sizeof(name4[0]) - 1 } + { name1, S_OK, &IID_ISWbemServices, ARRAY_SIZE( name1 ) - 1 }, + { name2, S_OK, &IID_ISWbemServices, ARRAY_SIZE( name2 ) - 1 }, + { name3, S_OK, &IID_ISWbemObject, ARRAY_SIZE( name3 ) - 1 }, + { name4, S_OK, &IID_ISWbemObject, ARRAY_SIZE( name4 ) - 1 } }; IParseDisplayName *displayname; IBindCtx *ctx; @@ -79,7 +79,7 @@ static void test_ParseDisplayName(void) hr = CreateBindCtx( 0, &ctx ); ok( hr == S_OK, "got %x\n", hr ); - for (i =0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i =0; i < ARRAY_SIZE( tests ); i++) { str = SysAllocString( tests[i].name ); eaten = 0xdeadbeef;

1 0

Zebediah Figura : dbghelp: Don' t enforce child architecture in elf_map_file().
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: c2c0e4fe510f75c757e5dbdc1b727a7c9f3d6f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c0e4fe510f75c757e5dbdc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 31 17:26:21 2018 -0500 dbghelp: Don't enforce child architecture in elf_map_file(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e047a7f..e4689a7 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -346,12 +346,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* /* and check for an ELF header */ if (memcmp(fmap->u.elf.elfhdr.e_ident, elf_signature, sizeof(elf_signature))) goto done; - /* and check 32 vs 64 size according to current machine */ -#ifdef _WIN64 - if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS64) goto done; -#else - if (fmap->u.elf.elfhdr.e_ident[EI_CLASS] != ELFCLASS32) goto done; -#endif + fmap->addr_size = fmap->u.elf.elfhdr.e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0]));

1 0

Zebediah Figura : dbghelp: Detect ELF architecture before reading the whole header.
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: a612f1f56fefd00ebe6d8f7bcf7c826f5aa85eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=a612f1f56fefd00ebe6d8f7b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 31 17:26:22 2018 -0500 dbghelp: Detect ELF architecture before reading the whole header. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e4689a7..d0b483a 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -307,6 +307,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* char* filename; unsigned len; BOOL ret = FALSE; + unsigned char e_ident[EI_NIDENT]; switch (emfd->kind) { @@ -340,14 +341,19 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* case from_process: break; } - if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) + + if (!elf_map_file_read(fmap, emfd, e_ident, sizeof(e_ident), 0)) goto done; /* and check for an ELF header */ - if (memcmp(fmap->u.elf.elfhdr.e_ident, - elf_signature, sizeof(elf_signature))) goto done; + if (memcmp(e_ident, elf_signature, sizeof(elf_signature))) + goto done; + + fmap->addr_size = e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; + + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) + goto done; - fmap->addr_size = fmap->u.elf.elfhdr.e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0])); if (!fmap->u.elf.sect) goto done;

1 0

Zebediah Figura : dbghelp: Translate the 32-bit ELF header to the 64-bit one.
by Alexandre Julliard 01 Jun '18

01 Jun '18

Module: wine Branch: master Commit: 799e0bfa57c4c2a7922c43031bd0d95c6add6a1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=799e0bfa57c4c2a7922c4303… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 31 17:26:23 2018 -0500 dbghelp: Translate the 32-bit ELF header to the 64-bit one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 29 +++++++++++++++++++++++++++-- dlls/dbghelp/image_private.h | 4 +--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index d0b483a..edf32b5 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -351,8 +351,33 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap->addr_size = e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; - if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) - goto done; + if (fmap->addr_size == 32) + { + Elf32_Ehdr elfhdr32; + + if (!elf_map_file_read(fmap, emfd, &elfhdr32, sizeof(elfhdr32), 0)) + goto done; + + memcpy(fmap->u.elf.elfhdr.e_ident, elfhdr32.e_ident, EI_NIDENT); + fmap->u.elf.elfhdr.e_type = elfhdr32.e_type; + fmap->u.elf.elfhdr.e_machine = elfhdr32.e_machine; + fmap->u.elf.elfhdr.e_version = elfhdr32.e_version; + fmap->u.elf.elfhdr.e_entry = elfhdr32.e_entry; + fmap->u.elf.elfhdr.e_phoff = elfhdr32.e_phoff; + fmap->u.elf.elfhdr.e_shoff = elfhdr32.e_shoff; + fmap->u.elf.elfhdr.e_flags = elfhdr32.e_flags; + fmap->u.elf.elfhdr.e_ehsize = elfhdr32.e_ehsize; + fmap->u.elf.elfhdr.e_phentsize = elfhdr32.e_phentsize; + fmap->u.elf.elfhdr.e_phnum = elfhdr32.e_phnum; + fmap->u.elf.elfhdr.e_shentsize = elfhdr32.e_shentsize; + fmap->u.elf.elfhdr.e_shnum = elfhdr32.e_shnum; + fmap->u.elf.elfhdr.e_shstrndx = elfhdr32.e_shstrndx; + } + else + { + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) + goto done; + } fmap->u.elf.sect = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elfhdr.e_shnum * sizeof(fmap->u.elf.sect[0])); diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 429b8fb..fa15000 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -59,14 +59,12 @@ typedef struct section macho_section; #ifdef __ELF__ #ifdef _WIN64 -#define Elf_Ehdr Elf64_Ehdr #define Elf_Shdr Elf64_Shdr #define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym #define Elf_auxv_t Elf64_auxv_t #else -#define Elf_Ehdr Elf32_Ehdr #define Elf_Shdr Elf32_Shdr #define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn @@ -97,7 +95,7 @@ struct image_file_map struct image_file_map* alternate; /* another ELF file (linked to this one) */ char* target_copy; #ifdef __ELF__ - Elf_Ehdr elfhdr; + Elf64_Ehdr elfhdr; struct { Elf_Shdr shdr;

1 0