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

Alexandre Julliard : ntdll: Avoid using tolowerW().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 7a974814cda795801fb845887508e85edaa67df6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a974814cda795801fb84588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:09:15 2020 +0200 ntdll: Avoid using tolowerW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 31 +++++++++++++------------------ dlls/ntdll/loader.c | 13 +++++++------ dlls/ntdll/locale.c | 4 +++- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cb9ce3740e..80777da149 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1316,8 +1316,8 @@ static ULONG hash_short_file_name( const UNICODE_STRING *name, LPWSTR buffer ) if (!is_case_sensitive) { for (p = name->Buffer, hash = 0xbeef; p < end - 1; p++) - hash = (hash<<3) ^ (hash>>5) ^ tolowerW(*p) ^ (tolowerW(p[1]) << 8); - hash = (hash<<3) ^ (hash>>5) ^ tolowerW(*p); /* Last character */ + hash = (hash<<3) ^ (hash>>5) ^ RtlDowncaseUnicodeChar(*p) ^ (RtlDowncaseUnicodeChar(p[1]) << 8); + hash = (hash<<3) ^ (hash>>5) ^ RtlDowncaseUnicodeChar(*p); /* Last character */ } else { @@ -2245,29 +2245,24 @@ static int match_redirect( const WCHAR *path, int len, const WCHAR *redir, BOOLE { int i = 0; - while (i < len && *redir) + while (i < len) { - if (IS_SEPARATOR(path[i])) + int start = i; + while (i < len && !IS_SEPARATOR(path[i])) i++; + if (check_case) { - if (*redir++ != '\\') return 0; - while (i < len && IS_SEPARATOR(path[i])) i++; - continue; /* move on to next path component */ - } - else if (check_case) - { - if (path[i] != *redir) return 0; + if (strncmpW( path + start, redir, i - start )) return 0; } else { - if (tolowerW(path[i]) != tolowerW(*redir)) return 0; + if (wcsnicmp( path + start, redir, i - start )) return 0; } - i++; - redir++; + redir += i - start; + while (i < len && IS_SEPARATOR(path[i])) i++; + if (!*redir) return i; + if (*redir++ != '\\') return 0; } - if (*redir) return 0; - if (i < len && !IS_SEPARATOR(path[i])) return 0; - while (i < len && IS_SEPARATOR(path[i])) i++; - return i; + return 0; } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8f607409f5..0e2e3f7dd1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1749,16 +1749,17 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING { static const WCHAR nt_prefixW[] = {'\\','?','?','\\',0}; static const WCHAR soW[] = {'.','s','o',0}; - WCHAR *p, *fullname; - size_t i, len = strlen(filename); + WCHAR *p, *fullname, filenameW[256]; + size_t len = strlen(filename); + + if (len >= ARRAY_SIZE(filenameW)) return FALSE; + ascii_to_unicode( filenameW, filename, len + 1 ); /* check if path can correspond to the dll we have */ if (path && (p = strrchrW( path->Buffer, '\\' ))) { p++; - for (i = 0; i < len; i++) - if (tolowerW(p[i]) != tolowerW( (WCHAR)filename[i]) ) break; - if (i == len && (!p[len] || !wcsicmp( p + len, soW ))) + if (!wcsnicmp( p, filenameW, len ) && (!p[len] || !wcsicmp( p + len, soW ))) { /* the filename matches, use path as the full path */ len += p - path->Buffer; @@ -1775,7 +1776,7 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING return FALSE; strcpyW( fullname, nt_prefixW ); strcatW( fullname, system_dir ); - ascii_to_unicode( fullname + strlenW(fullname), filename, len + 1 ); + strcatW( fullname, filenameW ); done: RtlInitUnicodeString( nt_name, fullname ); return TRUE; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 915a644c9d..0969037078 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1496,7 +1496,9 @@ NTSTATUS WINAPI RtlUnicodeToOemN( char *dst, DWORD dstlen, DWORD *reslen, */ WCHAR WINAPI RtlDowncaseUnicodeChar( WCHAR wch ) { - return casemap( nls_info.LowerCaseTable, wch ); + if (nls_info.LowerCaseTable) return casemap( nls_info.LowerCaseTable, wch ); + if (wch >= 'A' && wch <= 'Z') wch += 'a' - 'A'; + return wch; }

1 0

Alexandre Julliard : ntdll: Avoid using atoiW().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 8f3d869d784753d814a3493d01c3650f45389eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f3d869d784753d814a3493d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:09:49 2020 +0200 ntdll: Avoid using atoiW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/version.c | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index cd17c6c135..d53ddf8694 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3141,10 +3141,10 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) else data_pos = data_len; tmp = dir_info->FileName + (strchrW(lookup, '*') - lookup); - build = atoiW(tmp); + build = wcstoul( tmp, NULL, 10 ); if (build < min_build) continue; tmp = strchrW(tmp, '.') + 1; - revision = atoiW(tmp); + revision = wcstoul( tmp, NULL, 10 ); if (build == min_build && revision < min_revision) continue; tmp = strchrW(tmp, '_') + 1; tmp = strchrW(tmp, '_') + 1; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index fe0d1755d0..ccb2e76c20 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -301,6 +301,7 @@ ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); #define towupper(c) NTDLL_towupper(c) #define wcslwr(s) NTDLL__wcslwr(s) #define wcsupr(s) NTDLL__wcsupr(s) +#define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) /* convert from straight ASCII to Unicode without depending on the current codepage */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 4994dbbb5e..e5fb63e778 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -285,9 +285,9 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) if (p) { *p++ = 0; - version->dwMinorVersion = atoiW( p ); + version->dwMinorVersion = wcstoul( p, NULL, 10 ); } - version->dwMajorVersion = atoiW( str ); + version->dwMajorVersion = wcstoul( str, NULL, 10 ); } if (version->dwMajorVersion) /* we got the main version, now fetch the other fields */ @@ -302,7 +302,7 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) { WCHAR *str = (WCHAR *)info->Data; str[info->DataLength / sizeof(WCHAR)] = 0; - version->dwBuildNumber = atoiW( str ); + version->dwBuildNumber = wcstoul( str, NULL, 10 ); } /* get version description */ @@ -400,7 +400,7 @@ static BOOL get_win9x_registry_version( RTL_OSVERSIONINFOEXW *version ) str[info->DataLength / sizeof(WCHAR)] = 0; p = strchrW( str, '.' ); if (p) *p++ = 0; - version->dwMajorVersion = atoiW( str ); + version->dwMajorVersion = wcstoul( str, NULL, 10 ); if (p) { str = p; @@ -408,9 +408,9 @@ static BOOL get_win9x_registry_version( RTL_OSVERSIONINFOEXW *version ) if (p) { *p++ = 0; - version->dwBuildNumber = atoiW( p ); + version->dwBuildNumber = wcstoul( p, NULL, 10 ); } - version->dwMinorVersion = atoiW( str ); + version->dwMinorVersion = wcstoul( str, NULL, 10 ); } /* build number contains version too on Win9x */ version->dwBuildNumber |= MAKEWORD( version->dwMinorVersion, version->dwMajorVersion ) << 16;

1 0

Nikolay Sivov : mfplat/tests: Link to MFHeap* functions directly.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: b2885d14d6ffa26247e45ba42355a23c9f3a97fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2885d14d6ffa26247e45ba4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:26 2020 +0300 mfplat/tests: Link to MFHeap* functions directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 185bacdebe..78d73b7580 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -76,8 +76,6 @@ static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *s static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); -static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); -static void (WINAPI *pMFHeapFree)(void *p); static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_queue); static HRESULT (WINAPI *pMFAddPeriodicCallback)(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); @@ -678,8 +676,6 @@ static void init_functions(void) X(MFCreateTransformActivate); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); - X(MFHeapAlloc); - X(MFHeapFree); X(MFPutWaitingWorkItem); X(MFRegisterLocalByteStreamHandler); X(MFRegisterLocalSchemeHandler); @@ -2483,16 +2479,10 @@ static void test_MFHeapAlloc(void) { void *res; - if (!pMFHeapAlloc) - { - win_skip("MFHeapAlloc() is not available.\n"); - return; - } - - res = pMFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore); + res = MFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore); ok(res != NULL, "MFHeapAlloc failed.\n"); - pMFHeapFree(res); + MFHeapFree(res); } static void test_scheduled_items(void)

1 0

Alexandre Julliard : ntdll: Avoid using sprintfW().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: eb1b2e548656dc3d08cbf3c35454621491b84126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1b2e548656dc3d08cbf3c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 22:18:41 2020 +0200 ntdll: Avoid using sprintfW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 12 ++++++------ dlls/ntdll/atom.c | 3 ++- dlls/ntdll/env.c | 4 ++-- dlls/ntdll/locale.c | 16 ++++++++-------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/process.c | 2 +- dlls/ntdll/rtl.c | 4 ++-- dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/sec.c | 6 +++--- dlls/ntdll/time.c | 2 +- 10 files changed, 27 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb1b2e548656dc3d08cb…

1 0

Nikolay Sivov : mf: Set cancellation object directly (Coverity).
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: cb3517a1bf168e586fdc520f05f3842c2621b8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb3517a1bf168e586fdc520f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:27 2020 +0300 mf: Set cancellation object directly (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index ac80c51016..01fe17866c 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -760,17 +760,20 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if hr = MFCreateAsyncResult(&context->IUnknown_iface, &handler->IMFAsyncCallback_iface, (IUnknown *)caller, &item); IUnknown_Release(&context->IUnknown_iface); - IMFAsyncResult_Release(caller); if (SUCCEEDED(hr)) { if (SUCCEEDED(hr = MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_IO, item))) { if (cancel_cookie) - IMFAsyncResult_GetState(item, cancel_cookie); + { + *cancel_cookie = (IUnknown *)caller; + IUnknown_AddRef(*cancel_cookie); + } } IMFAsyncResult_Release(item); } + IMFAsyncResult_Release(caller); return hr; }

1 0

Alexandre Julliard : ntdll: Avoid using toupperW().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 1cde8696271e71364ba2df0aaa374c93953f6fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cde8696271e71364ba2df0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 12:05:16 2020 +0200 ntdll: Avoid using toupperW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/loadorder.c | 17 +++++++---------- dlls/ntdll/locale.c | 3 ++- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 993a661015..cb9ce3740e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1394,7 +1394,7 @@ static BOOLEAN match_filename( const UNICODE_STRING *name_str, const UNICODE_STR if (is_case_sensitive) while (name < name_end && (*name != *mask)) name++; else - while (name < name_end && (toupperW(*name) != toupperW(*mask))) name++; + while (name < name_end && (towupper(*name) != towupper(*mask))) name++; next_to_retry = name; break; case '?': @@ -1403,7 +1403,7 @@ static BOOLEAN match_filename( const UNICODE_STRING *name_str, const UNICODE_STR break; default: if (is_case_sensitive) mismatch = (*mask != *name); - else mismatch = (toupperW(*mask) != toupperW(*name)); + else mismatch = (towupper(*mask) != towupper(*name)); if (!mismatch) { diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 8469f487d3..8c540f9683 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -89,13 +89,12 @@ static const WCHAR *get_basename( const WCHAR *name ) * * Remove extension if it is ".dll". */ -static inline void remove_dll_ext( WCHAR *ext ) +static inline void remove_dll_ext( WCHAR *name ) { - if (ext[0] == '.' && - toupperW(ext[1]) == 'D' && - toupperW(ext[2]) == 'L' && - toupperW(ext[3]) == 'L' && - !ext[4]) ext[0] = 0; + static const WCHAR dllW[] = {'.','d','l','l',0}; + WCHAR *p = strrchrW( name, '.' ); + + if (p && !wcsicmp( p, dllW )) *p = 0; } @@ -213,8 +212,7 @@ static void add_load_order_set( WCHAR *entry ) if (*end) *end++ = 0; if (*entry) { - WCHAR *ext = strrchrW(entry, '.'); - if (ext) remove_dll_ext( ext ); + remove_dll_ext( entry ); ldo.modulename = entry; add_load_order( &ldo ); entry = end; @@ -457,10 +455,9 @@ enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_n if (!(len = strlenW(path))) return ret; if (!(module = RtlAllocateHeap( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR) ))) return ret; strcpyW( module+1, path ); /* reserve module[0] for the wildcard char */ + remove_dll_ext( module + 1 ); basename = (WCHAR *)get_basename( module+1 ); - if (len >= 4) remove_dll_ext( module + 1 + len - 4 ); - /* first explicit module name */ if ((ret = get_load_order_value( std_key, app_key, module+1 )) != LO_INVALID) goto done; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 123b8985b1..915a644c9d 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1638,7 +1638,8 @@ WCHAR __cdecl NTDLL_towlower( WCHAR ch ) */ WCHAR __cdecl NTDLL_towupper( WCHAR ch ) { - return casemap( nls_info.UpperCaseTable, ch ); + if (nls_info.UpperCaseTable) return casemap( nls_info.UpperCaseTable, ch ); + return casemap_ascii( ch ); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 20feabf56b..fe0d1755d0 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -298,6 +298,7 @@ ULONG __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base ); #define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2) #define wcsnicmp(s1,s2,n) NTDLL__wcsnicmp(s1,s2,n) +#define towupper(c) NTDLL_towupper(c) #define wcslwr(s) NTDLL__wcslwr(s) #define wcsupr(s) NTDLL__wcsupr(s) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 65539fa018..2f7b031d81 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -670,7 +670,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) case RELATIVE_DRIVE_PATH: /* c:foo */ dep = 2; - if (toupperW(name[0]) != toupperW(cd->Buffer[0]) || cd->Buffer[1] != ':') + if (wcsnicmp( name, cd->Buffer, 2 )) { UNICODE_STRING var, val;

1 0

Serge Gautherie : include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 34f3e7793b40d0eac60c373f66f262be2e0d5cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=34f3e7793b40d0eac60c373f… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Mar 30 07:29:30 2020 +0200 include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 9fc40c73eb..1871910efa 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -145,14 +145,14 @@ typedef GUID FMTID,*LPFMTID; #define REFCLSID const CLSID & #define REFIID const IID & #define REFFMTID const FMTID & -#else /* !defined(__cplusplus) */ +#else #define REFGUID const GUID* __MIDL_CONST #define REFCLSID const CLSID* __MIDL_CONST #define REFIID const IID* __MIDL_CONST #define REFFMTID const FMTID* __MIDL_CONST -#endif /* !defined(__cplusplus) */ +#endif -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) { @@ -161,16 +161,16 @@ inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) ((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] && ((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]); } -#else /* defined(__cplusplus) && !defined(CINTERFACE) */ +#else #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #define InlineIsEqualGUID(rguid1, rguid2) \ (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \ ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \ ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \ ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3]) -#endif /* defined(__cplusplus) && !defined(CINTERFACE) */ +#endif -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #include <string.h> inline bool operator==(const GUID& guidOne, const GUID& guidOther) {

1 0

Jacek Caban : dbghelp: Fix misleading indentation warning.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 94ad6bd2e66f589303fe9102b9a81b1f3e8ea9c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ad6bd2e66f589303fe9102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:03:47 2020 +0200 dbghelp: Fix misleading indentation warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 949cd412d3..52de3b66f7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -755,7 +755,10 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st case DW_OP_eq: stack[stk-1] = (stack[stk-1] == stack[stk]); stk--; break; case DW_OP_ne: stack[stk-1] = (stack[stk-1] != stack[stk]); stk--; break; case DW_OP_skip: tmp = dwarf2_parse_u2(ctx); ctx->data += tmp; break; - case DW_OP_bra: tmp = dwarf2_parse_u2(ctx); if (!stack[stk--]) ctx->data += tmp; break; + case DW_OP_bra: + tmp = dwarf2_parse_u2(ctx); + if (!stack[stk--]) ctx->data += tmp; + break; case DW_OP_regx: tmp = dwarf2_leb128_as_unsigned(ctx); if (!piece_found)

1 0

Jacek Caban : dbghelp: Use local stab_nlist declaration in macho_module.c.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 061146c2ab530a54f8323331e88c5771dd7bba49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=061146c2ab530a54f8323331… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:02:23 2020 +0200 dbghelp: Use local stab_nlist declaration in macho_module.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 9 +++++++++ dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/stabs.c | 10 +--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index d3c154b713..2b094d6db5 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -134,6 +134,15 @@ struct image_section_map LONG_PTR sidx; }; +struct stab_nlist +{ + unsigned n_strx; + unsigned char n_type; + char n_other; + short n_desc; + unsigned n_value; +}; + 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; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index d10e402de2..ff7cf2b3c0 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -932,7 +932,7 @@ static int macho_parse_symtab(struct image_file_map* ifm, struct macho_debug_info* mdi = user; const char* stabstr; int ret = 0; - size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct nlist) : sizeof(struct nlist_64); + size_t stabsize = (ifm->addr_size == 32) ? sizeof(struct stab_nlist) : sizeof(struct nlist_64); const char *stab; TRACE("(%p/%p, %p, %p) %u syms at 0x%08x, strings 0x%08x - 0x%08x\n", fmap, fmap->handle, lc, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index fedb1084ab..6b15ca1f0d 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -60,6 +60,7 @@ #include "winnls.h" #include "dbghelp_private.h" +#include "image_private.h" #include "wine/debug.h" @@ -112,15 +113,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #define N_EXCL 0xc2 #define N_RBRAC 0xe0 -struct stab_nlist -{ - unsigned n_strx; - unsigned char n_type; - char n_other; - short n_desc; - unsigned n_value; -}; - static void stab_strcpy(char* dest, int sz, const char* source) { char* ptr = dest;

1 0

Jacek Caban : dbghelp: Provide N_PEXT and N_SECT defines when not available.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 208719a7507c41b77d3db9f6b8ffbcc5a4e02f3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=208719a7507c41b77d3db9f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 29 21:01:33 2020 +0200 dbghelp: Provide N_PEXT and N_SECT defines when not available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index ac3209c37b..744ccfa9df 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -69,6 +69,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #ifndef N_STAB #define N_STAB 0xe0 #endif +#ifndef N_PEXT +#define N_PEXT 0x10 +#endif #ifndef N_TYPE #define N_TYPE 0x1e #endif @@ -83,6 +86,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #ifndef N_ABS #define N_ABS 0x02 #endif +#ifndef N_SECT +#define N_SECT 0x0e +#endif #define N_GSYM 0x20 #define N_FUN 0x24 @@ -1643,16 +1649,13 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, /* Always ignore these, they seem to be used only on Darwin. */ break; case N_ABS: -#ifdef N_SECT case N_SECT: -#endif /* FIXME: Other definition types (N_TEXT, N_DATA, N_BSS, ...)? */ if (callback) { BOOL is_public = (stab_ptr->n_type & N_EXT); BOOL is_global = is_public; -#ifdef N_PEXT /* "private extern"; shared among compilation units in a shared * library, but not accessible from outside the library. */ if (stab_ptr->n_type & N_PEXT) @@ -1660,7 +1663,6 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, is_public = FALSE; is_global = TRUE; } -#endif if (*ptr == '_') ptr++; stab_strcpy(symname, sizeof(symname), ptr);

1 0