wine-commits December 2022

wine-commits@winehq.org

1 participants
539 discussions

Alexandre Julliard : kernelbase/tests: Fix an uninitialized variable warning.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 46e5dd3967ed64e04e8290a8ff18973d480dbec9 URL: https://gitlab.winehq.org/wine/wine/-/commit/46e5dd3967ed64e04e8290a8ff1897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 14:53:03 2022 +0100 kernelbase/tests: Fix an uninitialized variable warning. --- dlls/kernelbase/tests/path.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 1c0c8a2318b..0ef809d66aa 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1212,14 +1212,15 @@ static void test_PathCchCanonicalizeEx(void) ok(hr == E_INVALIDARG, "expect hr %#lx, got %#lx\n", E_INVALIDARG, hr); } + for (i = 0; i < ARRAY_SIZE(path_inW) - 1; i++) path_inW[i] = 'a'; + path_inW[PATHCCH_MAX_CCH] = '\0'; + path_outW[0] = 0xff; hr = pPathCchCanonicalizeEx(path_outW, 0, path_inW, 0); ok(hr == E_INVALIDARG, "expect hr %#lx, got %#lx\n", E_INVALIDARG, hr); ok(path_outW[0] = 0xff, "expect path_outW unchanged\n"); /* Test path length */ - for (i = 0; i < ARRAY_SIZE(path_inW) - 1; i++) path_inW[i] = 'a'; - path_inW[PATHCCH_MAX_CCH] = '\0'; hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), path_inW, PATHCCH_ALLOW_LONG_PATHS); ok(hr == HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), "expect hr %#lx, got %#lx\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), hr);

1 0

Alexandre Julliard : kernel32/tests: Fix an uninitialized variable warning.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 620089aade3dc040595275676284a88ef10dad72 URL: https://gitlab.winehq.org/wine/wine/-/commit/620089aade3dc040595275676284a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 14:52:45 2022 +0100 kernel32/tests: Fix an uninitialized variable warning. --- dlls/kernel32/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 2c657e26b24..7e122780602 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1878,14 +1878,14 @@ static void test_SearchPathW(void) HANDLE handle; DWORD ret; + GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); + /* NULL filename */ ret = SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); ok(ret == 0, "Expected failure, got %ld\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %#lx\n", GetLastError()); - GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); - /* empty filename */ SetLastError(0xdeadbeef); ret = SearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW);

1 0

Alexandre Julliard : winspool.drv: Remove a no longer used inline function.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 510f7ee01d80640e71a24916e00d0560b0ce75ee URL: https://gitlab.winehq.org/wine/wine/-/commit/510f7ee01d80640e71a24916e00d05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 15:35:20 2022 +0100 winspool.drv: Remove a no longer used inline function. No longer used since e164b8cefb9dfbf0af5b83e176a386eb2c490d6b. --- dlls/winspool.drv/info.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 602237fc5d7..bc55d7f6d73 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -484,15 +484,6 @@ ret: return ret; } -/****************************************************************** - * verify, that the filename is a local file - * - */ -static inline BOOL is_local_file(LPWSTR name) -{ - return (name[0] && (name[1] == ':') && (name[2] == '\\')); -} - /* ################################ */ static int multi_sz_lenA(const char *str)

1 0

Alexandre Julliard : winedbg: Fix printf format warnings on ARM platforms.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 57c58be77dd7ee70a5854cea9d22d38644dd8a47 URL: https://gitlab.winehq.org/wine/wine/-/commit/57c58be77dd7ee70a5854cea9d22d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 15:09:03 2022 +0100 winedbg: Fix printf format warnings on ARM platforms. --- programs/winedbg/be_arm.c | 8 ++++---- programs/winedbg/be_arm64.c | 2 +- programs/winedbg/memory.c | 2 +- programs/winedbg/stack.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a505697c9bb..02b56de4408 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1704,13 +1704,13 @@ static void be_arm_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all_r if (!((ctx->ctx.Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-'; - dbg_printf(" Pc:%08x Sp:%08x Lr:%08x Cpsr:%08x(%s)\n", + dbg_printf(" Pc:%08lx Sp:%08lx Lr:%08lx Cpsr:%08lx(%s)\n", ctx->ctx.Pc, ctx->ctx.Sp, ctx->ctx.Lr, ctx->ctx.Cpsr, buf); - dbg_printf(" r0:%08x r1:%08x r2:%08x r3:%08x\n", + dbg_printf(" r0:%08lx r1:%08lx r2:%08lx r3:%08lx\n", ctx->ctx.R0, ctx->ctx.R1, ctx->ctx.R2, ctx->ctx.R3); - dbg_printf(" r4:%08x r5:%08x r6:%08x r7:%08x\n", + dbg_printf(" r4:%08lx r5:%08lx r6:%08lx r7:%08lx\n", ctx->ctx.R4, ctx->ctx.R5, ctx->ctx.R6, ctx->ctx.R7); - dbg_printf(" r8:%08x r9:%08x r10:%08x r11:%08x r12:%08x\n", + dbg_printf(" r8:%08lx r9:%08lx r10:%08lx r11:%08lx r12:%08lx\n", ctx->ctx.R8, ctx->ctx.R9, ctx->ctx.R10, ctx->ctx.R11, ctx->ctx.R12); if (all_regs) dbg_printf( "Floating point ARM dump not implemented\n" ); diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index d9e0a97bce5..ce7be7ca734 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -80,7 +80,7 @@ static void be_arm64_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all if (!((ctx->ctx.Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-'; - dbg_printf(" Pc:%016I64x Sp:%016I64x Lr:%016I64x Cpsr:%08x(%s)\n", + dbg_printf(" Pc:%016I64x Sp:%016I64x Lr:%016I64x Cpsr:%08lx(%s)\n", ctx->ctx.Pc, ctx->ctx.Sp, ctx->ctx.u.s.Lr, ctx->ctx.Cpsr, buf); dbg_printf(" x0: %016I64x x1: %016I64x x2: %016I64x x3: %016I64x x4: %016I64x\n", ctx->ctx.u.s.X0, ctx->ctx.u.s.X1, ctx->ctx.u.s.X2, ctx->ctx.u.s.X3, ctx->ctx.u.s.X4); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index a8318675ff6..c1a714626b2 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -726,7 +726,7 @@ void print_address(const ADDRESS64* addr, BOOLEAN with_line) if (!SymGetModuleInfo(dbg_curr_process->handle, lin, &im)) return; dbg_printf(" %s", im.ModuleName); if (lin > im.BaseOfImage) - dbg_printf("+0x%Ix", lin - im.BaseOfImage); + dbg_printf("+0x%Ix", lin - (DWORD_PTR)im.BaseOfImage); } if (with_line) { diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 59ec7f6c45f..4acb5666079 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -296,7 +296,7 @@ static void stack_print_addr_and_args(void) dbg_printf(" [%s:%lu]", il.FileName, il.LineNumber); dbg_printf(" in %s", im.ModuleName); } - else dbg_printf(" in %s (+0x%Ix)", im.ModuleName, frm->linear_pc - im.BaseOfImage); + else dbg_printf(" in %s (+0x%Ix)", im.ModuleName, frm->linear_pc - (DWORD_PTR)im.BaseOfImage); } /******************************************************************

1 0

Alexandre Julliard : oleaut32: Fix printf format warnings on ARM platforms.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 7ae24a04b5389a0a9a2a5131788e543a82856dd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ae24a04b5389a0a9a2a5131788e54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 15:06:04 2022 +0100 oleaut32: Fix printf format warnings on ARM platforms. --- dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/typelib.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e0ad9719f1c..bcbe85efae2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1282,7 +1282,7 @@ static VARIANT WINAPI inst_func2(void *inst, VARIANT v1, VARIANT v2) ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); - ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_I4(&v1) == 2, "unexpected %ld\n", V_I4(&v1)); ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a7bbb273856..602b9a1ee17 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6374,7 +6374,7 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART UINT i; DWORD *args; - TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + TRACE("(%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d))\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); @@ -6673,7 +6673,7 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART int dcount = 0; /* double-precision float register index count */ #endif - TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + TRACE("(%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d))\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); if (cc != CC_STDCALL && cc != CC_CDECL) @@ -6883,7 +6883,7 @@ HRESULT WINAPI DispCallFunc( void *instance, ULONG_PTR offset, CALLCONV cc, VART int rcount; /* 64-bit register index count */ int fpcount = 0; /* float register index count */ - TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + TRACE("(%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d))\n", instance, offset, cc, ret_type, count, types, vargs, result, V_VT(result)); if (cc != CC_STDCALL && cc != CC_CDECL)

1 0

Alexandre Julliard : ntdll: Fix printf format warnings on ARM platforms.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 1909f1565ef8f776bdfc585f64998bb6c80a561a URL: https://gitlab.winehq.org/wine/wine/-/commit/1909f1565ef8f776bdfc585f64998b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 15:05:48 2022 +0100 ntdll: Fix printf format warnings on ARM platforms. --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/relay.c | 12 ++-- dlls/ntdll/signal_arm.c | 8 +-- dlls/ntdll/tests/exception.c | 154 +++++++++++++++++++++---------------------- dlls/ntdll/tests/info.c | 2 +- 5 files changed, 89 insertions(+), 89 deletions(-)

1 0

Alexandre Julliard : msvcrt: Fix printf format warnings on ARM platforms.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 755d7833390ec85d40fe1f5b7346e2dede8aa971 URL: https://gitlab.winehq.org/wine/wine/-/commit/755d7833390ec85d40fe1f5b7346e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 15:05:32 2022 +0100 msvcrt: Fix printf format warnings on ARM platforms. --- dlls/msvcrt/except_arm.c | 2 +- dlls/msvcrt/except_arm64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index fecbfe65929..293da217cd4 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -56,7 +56,7 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, DWORD frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch) { - FIXME("%p %x %p %p: not implemented\n", rec, frame, context, dispatch); + FIXME("%p %lx %p %p: not implemented\n", rec, frame, context, dispatch); return ExceptionContinueSearch; } diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 574e77485f9..e750cb88573 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -54,10 +54,10 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ -EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, DWORD frame, CONTEXT *context, +EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch) { - FIXME("%p %x %p %p: not implemented\n", rec, frame, context, dispatch); + FIXME("%p %I64x %p %p: not implemented\n", rec, frame, context, dispatch); return ExceptionContinueSearch; }

1 0

Alexandre Julliard : ldap: Use LONG instead of long for exported types.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: f48500bb3ab5b1cdb73d604719d1918443d924e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f48500bb3ab5b1cdb73d604719d191… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 14:52:26 2022 +0100 ldap: Use LONG instead of long for exported types. --- libs/ldap/include/lber_types.h | 11 ++++++----- libs/ldap/include/portable.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/ldap/include/lber_types.h b/libs/ldap/include/lber_types.h index c32b803a89a..e5991e597e5 100644 --- a/libs/ldap/include/lber_types.h +++ b/libs/ldap/include/lber_types.h @@ -21,6 +21,7 @@ #ifndef _LBER_TYPES_H #define _LBER_TYPES_H +#include <windef.h> #include <ldap_cdefs.h> LDAP_BEGIN_DECL @@ -29,13 +30,13 @@ LDAP_BEGIN_DECL #define LBER_INT_T int /* LBER tags (32 bits or larger) */ -#define LBER_TAG_T long +#undef LBER_TAG_T /* LBER socket descriptor */ #define LBER_SOCKET_T int /* LBER lengths (32 bits or larger) */ -#define LBER_LEN_T long +#undef LBER_LEN_T /* ------------------------------------------------------------ */ @@ -47,16 +48,16 @@ typedef signed LBER_INT_T ber_sint_t; typedef unsigned LBER_INT_T ber_uint_t; /* tags */ -typedef unsigned LBER_TAG_T ber_tag_t; +typedef ULONG ber_tag_t; /* "socket" descriptors */ typedef LBER_SOCKET_T ber_socket_t; /* lengths */ -typedef unsigned LBER_LEN_T ber_len_t; +typedef ULONG ber_len_t; /* signed lengths */ -typedef signed LBER_LEN_T ber_slen_t; +typedef LONG ber_slen_t; LDAP_END_DECL diff --git a/libs/ldap/include/portable.h b/libs/ldap/include/portable.h index d3867575fca..410ed9e31de 100644 --- a/libs/ldap/include/portable.h +++ b/libs/ldap/include/portable.h @@ -813,13 +813,13 @@ #define LBER_INT_T int /* define to large integer type */ -#define LBER_LEN_T long +/* #undef LBER_LEN_T */ /* define to socket descriptor type */ #define LBER_SOCKET_T int /* define to large integer type */ -#define LBER_TAG_T long +/* #undef LBER_TAG_T */ /* define to 1 if library is reentrant */ #define LDAP_API_FEATURE_X_OPENLDAP_REENTRANT 1

1 0

Alexandre Julliard : makedep: Add a helper function to skip spaces in strings.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: df50fca0f952fabb5bb1c5a31a53e64f07a81be9 URL: https://gitlab.winehq.org/wine/wine/-/commit/df50fca0f952fabb5bb1c5a31a53e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 14:53:16 2022 +0100 makedep: Add a helper function to skip spaces in strings. --- tools/makedep.c | 81 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 24fe9a8937c..04403c5b332 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -877,14 +877,23 @@ static struct incl_file *add_generated_source( struct makefile *make, const char } +/******************************************************************* + * skip_spaces + */ +static char *skip_spaces( const char *p ) +{ + while (*p == ' ' || *p == '\t') p++; + return (char *)p; +} + + /******************************************************************* * parse_include_directive */ static void parse_include_directive( struct file *source, char *str ) { - char quote, *include, *p = str; + char quote, *include, *p = skip_spaces( str ); - while (*p && isspace(*p)) p++; if (*p != '\"' && *p != '<' ) return; quote = *p++; if (quote == '<') quote = '>'; @@ -903,9 +912,8 @@ static void parse_pragma_directive( struct file *source, char *str ) { char *flag, *p = str; - if (!isspace( *p )) return; - while (*p && isspace(*p)) p++; - p = strtok( p, " \t" ); + if (*p != ' ' && *p != '\t') return; + p = strtok( skip_spaces( p ), " \t" ); if (strcmp( p, "makedep" )) return; while ((flag = strtok( NULL, " \t" ))) @@ -963,9 +971,9 @@ static void parse_pragma_directive( struct file *source, char *str ) */ static void parse_cpp_directive( struct file *source, char *str ) { - while (*str && isspace(*str)) str++; + str = skip_spaces( str ); if (*str++ != '#') return; - while (*str && isspace(*str)) str++; + str = skip_spaces( str ); if (!strncmp( str, "include", 7 )) parse_include_directive( source, str + 7 ); @@ -988,15 +996,13 @@ static void parse_idl_file( struct file *source, FILE *file ) while ((buffer = get_line( file ))) { char quote; - char *p = buffer; - while (*p && isspace(*p)) p++; + char *p = skip_spaces( buffer ); if (!strncmp( p, "importlib", 9 )) { - p += 9; - while (*p && isspace(*p)) p++; + p = skip_spaces( p + 9 ); if (*p++ != '(') continue; - while (*p && isspace(*p)) p++; + p = skip_spaces( p ); if (*p++ != '"') continue; include = p; while (*p && (*p != '"')) p++; @@ -1008,8 +1014,7 @@ static void parse_idl_file( struct file *source, FILE *file ) if (!strncmp( p, "import", 6 )) { - p += 6; - while (*p && isspace(*p)) p++; + p = skip_spaces( p + 6 ); if (*p != '"') continue; include = ++p; while (*p && (*p != '"')) p++; @@ -1022,16 +1027,14 @@ static void parse_idl_file( struct file *source, FILE *file ) /* check for #include inside cpp_quote */ if (!strncmp( p, "cpp_quote", 9 )) { - p += 9; - while (*p && isspace(*p)) p++; + p = skip_spaces( p + 9 ); if (*p++ != '(') continue; - while (*p && isspace(*p)) p++; + p = skip_spaces( p ); if (*p++ != '"') continue; if (*p++ != '#') continue; - while (*p && isspace(*p)) p++; + p = skip_spaces( p ); if (strncmp( p, "include", 7 )) continue; - p += 7; - while (*p && isspace(*p)) p++; + p = skip_spaces( p + 7 ); if (*p == '\\' && p[1] == '"') { p += 2; @@ -1082,16 +1085,13 @@ static void parse_rc_file( struct file *source, FILE *file ) while ((buffer = get_line( file ))) { char quote; - char *p = buffer; - while (*p && isspace(*p)) p++; + char *p = skip_spaces( buffer ); if (p[0] == '/' && p[1] == '*') /* check for magic makedep comment */ { - p += 2; - while (*p && isspace(*p)) p++; + p = skip_spaces( p + 2 ); if (strncmp( p, "@makedep:", 9 )) continue; - p += 9; - while (*p && isspace(*p)) p++; + p = skip_spaces( p + 9 ); quote = '"'; if (*p == quote) { @@ -1101,7 +1101,7 @@ static void parse_rc_file( struct file *source, FILE *file ) else { include = p; - while (*p && !isspace(*p) && *p != '*') p++; + while (*p && *p != ' ' && *p != '\t' && *p != '*') p++; } if (!*p) fatal_error( "malformed makedep comment\n" ); @@ -1131,10 +1131,10 @@ static void parse_in_file( struct file *source, FILE *file ) while ((buffer = get_line( file ))) { if (strncmp( buffer, ".TH", 3 )) continue; - if (!(p = strtok( buffer, " \t" ))) continue; /* .TH */ - if (!(p = strtok( NULL, " \t" ))) continue; /* program name */ - if (!(p = strtok( NULL, " \t" ))) continue; /* man section */ - source->args = xstrdup( p ); + p = skip_spaces( buffer + 3 ); + while (*p && *p != ' ' && *p != '\t') p++; /* program name */ + p = skip_spaces( p ); + if (*p) source->args = xstrdup( p ); /* man section */ return; } } @@ -1161,17 +1161,17 @@ static void parse_sfd_file( struct file *source, FILE *file ) while ((eol = strstr( p, "+AAoA" ))) { *eol = 0; - while (*p && isspace(*p)) p++; + p = skip_spaces( p ); if (*p++ == '#') { - while (*p && isspace(*p)) p++; + p = skip_spaces( p ); if (!strncmp( p, "pragma", 6 )) parse_pragma_directive( source, p + 6 ); } p = eol + 5; } - while (*p && isspace(*p)) p++; + p = skip_spaces( p ); if (*p++ != '#') return; - while (*p && isspace(*p)) p++; + p = skip_spaces( p ); if (!strncmp( p, "pragma", 6 )) parse_pragma_directive( source, p + 6 ); return; } @@ -1699,8 +1699,7 @@ static char *get_expanded_make_variable( const struct makefile *make, const char } /* consider empty variables undefined */ - p = expand; - while (*p && isspace(*p)) p++; + p = skip_spaces( expand ); if (*p) return expand; free( expand ); return NULL; @@ -1766,11 +1765,11 @@ static int set_make_variable( struct strarray *array, const char *assignment ) if (isspace(*p)) { *p++ = 0; - while (isspace(*p)) p++; + p = skip_spaces( p ); } if (*p != '=') return 0; /* not an assignment */ *p++ = 0; - while (isspace(*p)) p++; + p = skip_spaces( p ); strarray_set_value( array, name, p ); return 1; @@ -1796,7 +1795,7 @@ static struct makefile *parse_makefile( const char *path ) { if (!strncmp( buffer, separator, strlen(separator) )) break; if (*buffer == '\t') continue; /* command */ - while (isspace( *buffer )) buffer++; + buffer = skip_spaces( buffer ); if (*buffer == '#') continue; /* comment */ set_make_variable( &make->vars, buffer ); } @@ -4321,7 +4320,7 @@ static void parse_makeflags( const char *flags ) while (*p) { - while (isspace(*p)) p++; + p = skip_spaces( p ); var = buffer; while (*p && !isspace(*p)) {

1 0

Alexandre Julliard : makedep: Add the default Unix libraries also when building .dll.so files.
by Alexandre Julliard 08 Dec '22

08 Dec '22

Module: wine Branch: master Commit: 9576fbeff10e86c62870c12e7b464825cde1bfcd URL: https://gitlab.winehq.org/wine/wine/-/commit/9576fbeff10e86c62870c12e7b4648… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 10:53:24 2022 +0100 makedep: Add the default Unix libraries also when building .dll.so files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54096 --- tools/makedep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 893808930fb..24fe9a8937c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3079,6 +3079,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, all_libs = dep_libs = empty_strarray; strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); + if (!arch) strarray_addall( &all_libs, libs ); dll_name = arch_module_name( strmake( "%s.dll", obj ), arch ); obj_name = obj_dir_path( make, strmake( "%s%s.o", arch_dirs[arch], obj )); res_name = strmake( "%s%s.res", arch_dirs[arch], obj ); @@ -3319,6 +3320,7 @@ static void output_module( struct makefile *make, unsigned int arch ) strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, arch )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); + if (!arch) strarray_addall( &all_libs, libs ); if (delay_load_flags[arch]) {

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2022