November 2019 - wine-commits

Nikolay Sivov : propsys/tests: Merge test files.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: d189b55d2ffb038474cb6656dc8743eb34c35a3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d189b55d2ffb038474cb6656… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 00:13:36 2019 +0300 propsys/tests: Merge test files. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/Makefile.in | 1 - dlls/propsys/tests/propstore.c | 374 ----------------------------------------- dlls/propsys/tests/propsys.c | 342 +++++++++++++++++++++++++++++++++++++ 3 files changed, 342 insertions(+), 375 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d189b55d2ffb038474cb…

1 0

Piotr Caban : msvcrt: Enable printf %z, %t and %j formats.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 97557ae168109492e73b5d47b005a3e6c466a954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97557ae168109492e73b5d47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 2 14:39:28 2019 +0100 msvcrt: Enable printf %z, %t and %j formats. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 10 ++++++---- dlls/msvcrt/tests/printf.c | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 20bd77e792..d7f3b6f225 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -515,15 +515,17 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API break; } else if(*p == 'w') flags.WideString = *p++; -#if _MSVCR_VER >= 140 - else if(*p == 'z' || *p == 't') +#if _MSVCR_VER == 0 || _MSVCR_VER >= 140 + else if((*p == 'z' || *p == 't') && p[1] && strchr("diouxX", p[1])) flags.IntegerNative = *p++; - else if(*p == 'T') - flags.NaturalString = *p++; else if(*p == 'j') { flags.IntegerDouble++; p++; } +#endif +#if _MSVCR_VER >= 140 + else if(*p == 'T') + flags.NaturalString = *p++; #endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d1fe292143..4c153dab9e 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -163,8 +163,10 @@ static void test_sprintf( void ) { "%Ihd", "Ihd", 0, INT_ARG, 1 }, { "%I0d", "I0d", 0, INT_ARG, 1 }, { "%I64D", "D", 0, ULONGLONG_ARG, 0, -1 }, - { "%zx", "1", "zx", TODO_FLAG | INT_ARG, 1 }, - { "%z", "1", "z", TODO_FLAG | INT_ARG, 1 }, + { "%zx", "1", "zx", INT_ARG, 1 }, + { "%z", "z", 0, INT_ARG, 1 }, + { "%tx", "1", "tx", INT_ARG, 1 }, + { "%t", "t", 0, INT_ARG, 1 }, { "% d", " 1", 0, INT_ARG, 1 }, { "%+ d", "+1", 0, INT_ARG, 1 }, { "%S", "wide", 0, PTR_ARG, 0, 0, 0, L"wide" }, @@ -216,9 +218,8 @@ static void test_sprintf( void ) { "%u", "4294967295", 0, INT_ARG, -1 }, { "%w", "", 0, INT_ARG, -1 }, { "%h", "", 0, INT_ARG, -1 }, - { "%z", "z", 0, INT_ARG, -1 }, - { "%j", "", "j", TODO_FLAG | ULONGLONG_ARG, 0, -1 }, - { "%jd", "-1", "jd", TODO_FLAG | ULONGLONG_ARG, 0, -1 }, + { "%j", "", "j", ULONGLONG_ARG, 0, -1 }, + { "%jd", "-1", "jd", ULONGLONG_ARG, 0, -1 }, { "%F", "", 0, INT_ARG, -1 }, { "%N", "", 0, INT_ARG, -1 }, { "%H", "H", 0, INT_ARG, -1 },

1 0

Piotr Caban : msvcrt: Improve printf %I format support.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 1309e11ea1c5863616de7638731d00d6ab90b295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1309e11ea1c5863616de7638… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 2 14:39:23 2019 +0100 msvcrt: Improve printf %I format support. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/tests/printf.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 975977087d..20bd77e792 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -509,10 +509,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API p += 3; } else if(*(p+1)=='3' && *(p+2)=='2') p += 3; - else if(isdigit(*(p+1)) || !*(p+1)) - break; - else + else if(p[1] && strchr("diouxX", p[1])) flags.IntegerNative = *p++; + else + break; } else if(*p == 'w') flags.WideString = *p++; #if _MSVCR_VER >= 140 diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index ac5c37a59c..d1fe292143 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -159,6 +159,8 @@ static void test_sprintf( void ) " 00000000000000000000000000000000000000000000000000000000000000000000000000000001", 0, INT_ARG, 1 }, { "%I", "I", 0, INT_ARG, 1 }, + { "%Iq", "Iq", 0, INT_ARG, 1 }, + { "%Ihd", "Ihd", 0, INT_ARG, 1 }, { "%I0d", "I0d", 0, INT_ARG, 1 }, { "%I64D", "D", 0, ULONGLONG_ARG, 0, -1 }, { "%zx", "1", "zx", TODO_FLAG | INT_ARG, 1 }, @@ -256,6 +258,7 @@ static void test_sprintf( void ) int i, x, r; for (i=0; i<ARRAY_SIZE(tests); i++) { + memset(buffer, 'x', sizeof(buffer)); switch(tests[i].type & 0xff) { case NO_ARG: r = p_sprintf(buffer, tests[i].format);

1 0

Alexandre Julliard : kernel32/tests: Add more tests for FPU control registers.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 007f1b9a82aa2da84444d495affc90d699949956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=007f1b9a82aa2da84444d495… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 14:15:17 2019 +0100 kernel32/tests: Add more tests for FPU control registers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 123 ++++++++++++++++++++++++++++--------------- 1 file changed, 81 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index f87f7704a8..ddbbec93ad 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -24,6 +24,7 @@ #include <assert.h> #include <stdarg.h> #include <stdio.h> +#include <float.h> /* the tests intentionally pass invalid pointers and need an exception handler */ #define WINE_NO_INLINE_STRING @@ -1674,40 +1675,42 @@ static void test_ThreadErrorMode(void) pSetThreadErrorMode(oldmode, NULL); } -#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) || (defined(_MSC_VER) && defined(__i386__)) -static inline void set_fpu_cw(WORD cw) +struct fpu_thread_ctx { -#ifdef _MSC_VER - __asm { fnclex } - __asm { fldcw [cw] } -#else - __asm__ volatile ("fnclex; fldcw %0" : : "m" (cw)); -#endif -} + unsigned int cw; + unsigned long fpu_cw; + HANDLE finished; +}; -static inline WORD get_fpu_cw(void) +static inline unsigned long get_fpu_cw(void) { +#if defined(__i386__) || defined(__x86_64__) WORD cw = 0; + unsigned int sse = 0; #ifdef _MSC_VER __asm { fnstcw [cw] } + __asm { stmxcsr [sse] } #else __asm__ volatile ("fnstcw %0" : "=m" (cw)); + __asm__ volatile ("stmxcsr %0" : "=m" (sse)); #endif + return MAKELONG( cw, sse ); +#elif defined(__aarch64__) + unsigned long cw; + __asm__ __volatile__( "mrs %0, fpcr" : "=r" (cw) ); return cw; +#else + return 0; +#endif } -struct fpu_thread_ctx -{ - WORD cw; - HANDLE finished; -}; - static DWORD WINAPI fpu_thread(void *param) { struct fpu_thread_ctx *ctx = param; BOOL ret; - ctx->cw = get_fpu_cw(); + ctx->cw = _control87( 0, 0 ); + ctx->fpu_cw = get_fpu_cw(); ret = SetEvent(ctx->finished); ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); @@ -1715,7 +1718,7 @@ static DWORD WINAPI fpu_thread(void *param) return 0; } -static WORD get_thread_fpu_cw(void) +static unsigned int get_thread_fpu_cw( unsigned long *fpu_cw ) { struct fpu_thread_ctx ctx; DWORD tid, res; @@ -1734,34 +1737,72 @@ static WORD get_thread_fpu_cw(void) ok(!!res, "Failed to close event handle, last error %#x.\n", GetLastError()); CloseHandle(thread); + *fpu_cw = ctx.fpu_cw; return ctx.cw; } static void test_thread_fpu_cw(void) { - WORD initial_cw, cw; - - initial_cw = get_fpu_cw(); - ok(initial_cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", initial_cw); - - cw = get_thread_fpu_cw(); - ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw); - - set_fpu_cw(0xf60); - cw = get_fpu_cw(); - ok(cw == 0xf60, "Expected FPU control word 0xf60, got %#x.\n", cw); - - cw = get_thread_fpu_cw(); - ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw); - - cw = get_fpu_cw(); - ok(cw == 0xf60, "Expected FPU control word 0xf60, got %#x.\n", cw); - - set_fpu_cw(initial_cw); - cw = get_fpu_cw(); - ok(cw == initial_cw, "Expected FPU control word %#x, got %#x.\n", initial_cw, cw); -} + static const struct { unsigned int cw; unsigned long fpu_cw; } expected_cw[6] = + { +#ifdef __i386__ + { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, + { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ) }, + { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ) }, + { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) } +#elif defined(__x86_64__) + { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, + { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_64, MAKELONG( 0x27f, 0x7000 ) }, + { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_64, MAKELONG( 0x27f, 0x7000 ) }, + { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) } +#elif defined(__aarch64__) + { _MCW_EM | _PC_64, 0 }, + { _MCW_EM | _PC_64, 0 }, + { _EM_INEXACT | _RC_CHOP | _PC_64, 0xc08f00 }, + { _MCW_EM | _PC_64, 0 }, + { _EM_INEXACT | _RC_CHOP | _PC_64, 0xc08f00 }, + { _MCW_EM | _PC_64, 0 } +#else + { 0xdeadbeef, 0xdeadbeef } #endif + }; + unsigned int initial_cw, cw; + unsigned long fpu_cw; + + fpu_cw = get_fpu_cw(); + initial_cw = _control87( 0, 0 ); + ok(initial_cw == expected_cw[0].cw, "expected %#x got %#x\n", expected_cw[0].cw, initial_cw); + ok(fpu_cw == expected_cw[0].fpu_cw, "expected %#lx got %#lx\n", expected_cw[0].fpu_cw, fpu_cw); + + cw = get_thread_fpu_cw( &fpu_cw ); + ok(cw == expected_cw[1].cw, "expected %#x got %#x\n", expected_cw[1].cw, cw); + ok(fpu_cw == expected_cw[1].fpu_cw, "expected %#lx got %#lx\n", expected_cw[1].fpu_cw, fpu_cw); + + _control87( _EM_INEXACT | _RC_CHOP | _PC_24, _MCW_EM | _MCW_RC | _MCW_PC ); + cw = _control87( 0, 0 ); + fpu_cw = get_fpu_cw(); + ok(cw == expected_cw[2].cw, "expected %#x got %#x\n", expected_cw[2].cw, cw); + ok(fpu_cw == expected_cw[2].fpu_cw, "expected %#lx got %#lx\n", expected_cw[2].fpu_cw, fpu_cw); + + cw = get_thread_fpu_cw( &fpu_cw ); + ok(cw == expected_cw[3].cw, "expected %#x got %#x\n", expected_cw[3].cw, cw); + ok(fpu_cw == expected_cw[3].fpu_cw, "expected %#lx got %#lx\n", expected_cw[3].fpu_cw, fpu_cw); + + cw = _control87( 0, 0 ); + fpu_cw = get_fpu_cw(); + ok(cw == expected_cw[4].cw, "expected %#x got %#x\n", expected_cw[4].cw, cw); + ok(fpu_cw == expected_cw[4].fpu_cw, "expected %#lx got %#lx\n", expected_cw[4].fpu_cw, fpu_cw); + + _control87( initial_cw, _MCW_EM | _MCW_RC | _MCW_PC ); + cw = _control87( 0, 0 ); + fpu_cw = get_fpu_cw(); + ok(cw == expected_cw[5].cw, "expected %#x got %#x\n", expected_cw[5].cw, cw); + ok(fpu_cw == expected_cw[5].fpu_cw, "expected %#lx got %#lx\n", expected_cw[5].fpu_cw, fpu_cw); +} static const char manifest_dep[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" @@ -2180,9 +2221,7 @@ START_TEST(thread) test_TLS(); test_FLS(); test_ThreadErrorMode(); -#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) || (defined(_MSC_VER) && defined(__i386__)) test_thread_fpu_cw(); -#endif test_thread_actctx(); test_threadpool();

1 0

Alexandre Julliard : msvcrt: Don't change FPU control word in _control87() on x86-64.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 0e183cc3c0d3b6f89f79047cdd71c389afc75073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e183cc3c0d3b6f89f79047c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 14:35:52 2019 +0100 msvcrt: Don't change FPU control word in _control87() on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f56ec9dcf0..f6824128cd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1087,7 +1087,7 @@ double CDECL MSVCRT__chgsign(double num) * * Not exported by native msvcrt, added in msvcr80. */ -#if defined(__i386__) || defined(__x86_64__) +#ifdef __i386__ int CDECL __control87_2( unsigned int newval, unsigned int mask, unsigned int *x86_cw, unsigned int *sse2_cw ) { @@ -1225,12 +1225,55 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, unsigned int CDECL _control87(unsigned int newval, unsigned int mask) { unsigned int flags = 0; -#if defined(__i386__) || defined(__x86_64__) +#ifdef __i386__ unsigned int sse2_cw; __control87_2( newval, mask, &flags, &sse2_cw ); if ((flags ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) flags |= MSVCRT__EM_AMBIGUOUS; +#elif defined(__x86_64__) + unsigned long fpword; + + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + if (fpword & 0x80) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x100) flags |= MSVCRT__EM_DENORMAL; + if (fpword & 0x200) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x400) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x800) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x1000) flags |= MSVCRT__EM_INEXACT; + switch (fpword & 0x6000) + { + case 0x6000: flags |= MSVCRT__RC_CHOP; break; + case 0x4000: flags |= MSVCRT__RC_UP; break; + case 0x2000: flags |= MSVCRT__RC_DOWN; break; + } + switch (fpword & 0x8040) + { + case 0x0040: flags |= MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS; break; + case 0x8000: flags |= MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS; break; + case 0x8040: flags |= MSVCRT__DN_FLUSH; break; + } + flags = (flags & ~mask) | (newval & mask); + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x80; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x100; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x400; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x1000; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_CHOP: fpword |= 0x6000; break; + case MSVCRT__RC_UP: fpword |= 0x4000; break; + case MSVCRT__RC_DOWN: fpword |= 0x2000; break; + } + switch (flags & MSVCRT__MCW_DN) + { + case MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS: fpword |= 0x0040; break; + case MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS: fpword |= 0x8000; break; + case MSVCRT__DN_FLUSH: fpword |= 0x8040; break; + } + __asm__ __volatile__( "ldmxcsr %0" :: "m" (fpword) ); #elif defined(__aarch64__) unsigned long fpcr;

1 0

Alexandre Julliard : ntdll: Initialize FPU context on ARM64.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 6a0e0001ef9583f06266e4f611aaa0dc2e4c2b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a0e0001ef9583f06266e4f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 09:45:21 2019 +0100 ntdll: Initialize FPU context on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 96b20d8ff6..687219ec40 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1974,6 +1974,26 @@ __ASM_GLOBAL_FUNC( start_thread, "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" /* switch to the initial context */ "mov x0, sp\n\t" + "ldp q0, q1, [x0, #0x110]\n\t" /* context->V[0,1] */ + "ldp q2, q3, [x0, #0x130]\n\t" /* context->V[2,3] */ + "ldp q4, q5, [x0, #0x150]\n\t" /* context->V[4,5] */ + "ldp q6, q7, [x0, #0x170]\n\t" /* context->V[6,7] */ + "ldp q8, q9, [x0, #0x190]\n\t" /* context->V[8,9] */ + "ldp q10, q11, [x0, #0x1b0]\n\t" /* context->V[10,11] */ + "ldp q12, q13, [x0, #0x1d0]\n\t" /* context->V[12,13] */ + "ldp q14, q15, [x0, #0x1f0]\n\t" /* context->V[14,15] */ + "ldp q16, q17, [x0, #0x210]\n\t" /* context->V[16,17] */ + "ldp q18, q19, [x0, #0x230]\n\t" /* context->V[18,19] */ + "ldp q20, q21, [x0, #0x250]\n\t" /* context->V[20,21] */ + "ldp q22, q23, [x0, #0x270]\n\t" /* context->V[22,23] */ + "ldp q24, q25, [x0, #0x290]\n\t" /* context->V[24,25] */ + "ldp q26, q27, [x0, #0x2b0]\n\t" /* context->V[26,27] */ + "ldp q28, q29, [x0, #0x2d0]\n\t" /* context->V[28,29] */ + "ldp q30, q31, [x0, #0x2f0]\n\t" /* context->V[30,31] */ + "ldr w1, [x0, #0x310]\n\t" /* context->Fpcr */ + "msr fpcr, x1\n\t" + "ldr w1, [x0, #0x314]\n\t" /* context->Fpsr */ + "msr fpsr, x1\n\t" "ldp x1, x2, [x0, #0x10]\n\t" /* context->X1,2 */ "ldp x3, x4, [x0, #0x20]\n\t" /* context->X3,4 */ "ldp x5, x6, [x0, #0x30]\n\t" /* context->X5,6 */

1 0

Alexandre Julliard : server: Clarify naming of ARM64 floating-point registers.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 85f1fbdb7eb02069319dd67a4615871f5abb9bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f1fbdb7eb02069319dd67a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 09:45:04 2019 +0100 server: Clarify naming of ARM64 floating-point registers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 12 ++++++++++-- include/wine/server_protocol.h | 2 +- server/protocol.def | 2 +- server/trace.c | 8 +++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 17af494e29..96b20d8ff6 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -369,7 +369,11 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) if (flags & CONTEXT_FLOATING_POINT) { to->flags |= SERVER_CTX_FLOATING_POINT; - for (i = 0; i < 64; i++) to->fp.arm64_regs.d[i] = from->V[i / 2].D[i % 2]; + for (i = 0; i < 32; i++) + { + to->fp.arm64_regs.q[i].low = from->V[i].s.Low; + to->fp.arm64_regs.q[i].high = from->V[i].s.High; + } to->fp.arm64_regs.fpcr = from->Fpcr; to->fp.arm64_regs.fpsr = from->Fpsr; } @@ -414,7 +418,11 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) if (from->flags & SERVER_CTX_FLOATING_POINT) { to->ContextFlags |= CONTEXT_FLOATING_POINT; - for (i = 0; i < 64; i++) to->V[i / 2].D[i % 2] = from->fp.arm64_regs.d[i]; + for (i = 0; i < 32; i++) + { + to->V[i].s.Low = from->fp.arm64_regs.q[i].low; + to->V[i].s.High = from->fp.arm64_regs.q[i].high; + } to->Fpcr = from->fp.arm64_regs.fpcr; to->Fpsr = from->fp.arm64_regs.fpsr; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4f35047241..83ce56ca25 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -156,7 +156,7 @@ typedef struct struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; - struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; + struct { struct { unsigned __int64 low, high; } q[32]; unsigned int fpcr, fpsr; } arm64_regs; } fp; union { diff --git a/server/protocol.def b/server/protocol.def index 6af0ae0cff..984f2a10fd 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -172,7 +172,7 @@ typedef struct struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; - struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; + struct { struct { unsigned __int64 low, high; } q[32]; unsigned int fpcr, fpsr; } arm64_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ union { diff --git a/server/trace.c b/server/trace.c index 615542cff5..0acfc92b27 100644 --- a/server/trace.c +++ b/server/trace.c @@ -727,10 +727,11 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) } if (ctx.flags & SERVER_CTX_FLOATING_POINT) { - for (i = 0; i < 64; i++) + for (i = 0; i < 32; i++) { - fprintf( stderr, ",d%u=", i ); - dump_uint64( "", &ctx.fp.arm64_regs.d[i] ); + fprintf( stderr, ",q%u=", i ); + dump_uint64( "", &ctx.fp.arm64_regs.q[i].high ); + dump_uint64( "", &ctx.fp.arm64_regs.q[i].low ); } fprintf( stderr, ",fpcr=%08x,fpsr=%08x", ctx.fp.arm64_regs.fpcr, ctx.fp.arm64_regs.fpsr ); } @@ -5602,6 +5603,7 @@ static const struct { "PIPE_CLOSING", STATUS_PIPE_CLOSING }, { "PIPE_CONNECTED", STATUS_PIPE_CONNECTED }, { "PIPE_DISCONNECTED", STATUS_PIPE_DISCONNECTED }, + { "PIPE_EMPTY", STATUS_PIPE_EMPTY }, { "PIPE_LISTENING", STATUS_PIPE_LISTENING }, { "PIPE_NOT_AVAILABLE", STATUS_PIPE_NOT_AVAILABLE }, { "PRIVILEGE_NOT_HELD", STATUS_PRIVILEGE_NOT_HELD },

1 0

Alexandre Julliard : ntdll: Fix FPU initialization for new threads on x86-64.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 0b2e65f53aeb4fbda660828ad06bff554fccb1d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b2e65f53aeb4fbda660828a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 14:34:25 2019 +0100 ntdll: Fix FPU initialization for new threads on x86-64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48019 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9645c5266c..c372f65b34 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4195,12 +4195,13 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, { __asm__( "movw %%cs,%0" : "=m" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=m" (context->SegSs) ); - __asm__( "fxsave %0" : "=m" (context->u.FltSave) ); context->Rcx = (ULONG_PTR)entry; context->Rdx = (ULONG_PTR)arg; context->Rsp = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase - 0x28; context->Rip = (ULONG_PTR)relay; context->EFlags = 0x200; + context->u.FltSave.ControlWord = 0x27f; + context->u.FltSave.MxCsr = context->MxCsr = 0x1f80; }

1 0

Alexandre Julliard : ntdll: Initialize MxCsr for new threads on x86.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 1b3fa021909fcb13d1517a8df0b84b6a225e6b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3fa021909fcb13d1517a8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 14:34:17 2019 +0100 ntdll: Initialize MxCsr for new threads on x86. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fd761246c5..e9dd0de2fc 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2716,6 +2716,7 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, context->Eip = (DWORD)relay; context->FloatSave.ControlWord = 0x27f; ((XMM_SAVE_AREA32 *)context->ExtendedRegisters)->ControlWord = 0x27f; + ((XMM_SAVE_AREA32 *)context->ExtendedRegisters)->MxCsr = 0x1f80; } @@ -2741,7 +2742,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, ctx = (CONTEXT *)((char *)NtCurrentTeb()->Tib.StackBase - 16) - 1; init_thread_context( ctx, entry, arg, relay ); } - ctx->ContextFlags = CONTEXT_FULL; + ctx->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; LdrInitializeThunk( ctx, (void **)&ctx->Eax, 0, 0 ); return ctx; }

1 0

Alexandre Julliard : makefiles: Pass --nostdinc also to widl.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 42cf6cce4bfdb1f4eb0b9b1b086310204a3bbb3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=42cf6cce4bfdb1f4eb0b9b1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:47:32 2019 +0100 makefiles: Pass --nostdinc also to widl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 67dfea43bb..13c2bd2342 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2786,6 +2786,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) ); output_filenames( target_flags ); + output_filename( "--nostdinc" ); output_filenames( defines ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" ));

1 0

Alexandre Julliard : widl: Add --sysroot and --nostdinc options.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 5f39d36a6c134bab77cea8f2e91c313e066eeffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f39d36a6c134bab77cea8f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:34:27 2019 +0100 widl: Add --sysroot and --nostdinc options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/Makefile.in | 2 +- tools/widl/widl.c | 34 ++++++++++++++++++++++++++++------ tools/widl/widl.man.in | 5 +++++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index e06d6cc5b3..80a12601de 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/wine/windows/\" +widl_EXTRADEFS = -DINCLUDEDIR=\"${includedir}\" EXTRALIBS = -lwpp diff --git a/tools/widl/widl.c b/tools/widl/widl.c index f5fa20c884..aa6697135b 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -60,6 +60,8 @@ static const char usage[] = " --local-stubs=file Write empty stubs for call_as/local methods to file\n" " -m32, -m64 Set the target architecture (Win32 or Win64)\n" " -N Do not preprocess input\n" +" --nostdinc Do not search the standard include path\n" +" --ns_prefix Prefix namespaces with ABI namespace\n" " --oldnames Use old naming conventions\n" " -o, --output=NAME Set the output file name\n" " -Otype Type of stubs to generate (-Os, -Oi, -Oif)\n" @@ -69,8 +71,7 @@ static const char usage[] = " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" " -robust Ignored, present for midl compatibility\n" -" --winrt Enable Windows Runtime mode\n" -" --ns_prefix Prefix namespaces with ABI namespace\n" +" --sysroot=DIR Prefix include paths with DIR\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -79,6 +80,7 @@ static const char usage[] = " --win32, --win64 Set the target architecture (Win32 or Win64)\n" " --win32-align n Set win32 structure alignment to 'n'\n" " --win64-align n Set win64 structure alignment to 'n'\n" +" --winrt Enable Windows Runtime mode\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" " * 0x02 Dump internal structures\n" @@ -125,6 +127,7 @@ int win32_packing = 8; int win64_packing = 8; int winrt_mode = 0; int use_abi_namespace = 0; +static int stdinc = 1; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -163,6 +166,7 @@ enum { DLLDATA_OPTION, DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, + NOSTDINC_OPTION, PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, @@ -170,6 +174,7 @@ enum { RT_NS_PREFIX, RT_OPTION, ROBUST_OPTION, + SYSROOT_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -185,6 +190,7 @@ static const struct option long_options[] = { { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, + { "nostdinc", 0, NULL, NOSTDINC_OPTION }, { "ns_prefix", 0, NULL, RT_NS_PREFIX }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, @@ -192,6 +198,7 @@ static const struct option long_options[] = { { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, { "robust", 0, NULL, ROBUST_OPTION }, + { "sysroot", 1, NULL, SYSROOT_OPTION }, { "target", 0, NULL, 'b' }, { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, @@ -567,10 +574,11 @@ void write_id_data(const statement_list_t *stmts) int main(int argc,char *argv[]) { - int optc; + int i, optc; int ret = 0; int opti = 0; char *output_name = NULL; + const char *sysroot = ""; signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -593,6 +601,9 @@ int main(int argc,char *argv[]) do_everything = 0; local_stubs_name = xstrdup(optarg); break; + case NOSTDINC_OPTION: + stdinc = 0; + break; case OLDNAMES_OPTION: old_names = 1; break; @@ -615,6 +626,9 @@ int main(int argc,char *argv[]) case RT_NS_PREFIX: use_abi_namespace = 1; break; + case SYSROOT_OPTION: + sysroot = xstrdup(optarg); + break; case WIN32_OPTION: pointer_size = 4; break; @@ -733,9 +747,17 @@ int main(int argc,char *argv[]) } } -#ifdef DEFAULT_INCLUDE_DIR - wpp_add_include_path(DEFAULT_INCLUDE_DIR); -#endif + if (stdinc) + { + static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + + for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) + { + if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; + wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); + wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); + } + } switch (target_cpu) { diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index ec81488a0e..010b7f04e2 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -41,6 +41,11 @@ specification is in the standard autoconf format as returned by \fBconfig.sub\fR. .IP "\fB-m32, -m64, --win32, --win64\fR" Force the target architecture to 32-bit or 64-bit. +.IP \fB\-\-sysroot=\fIdir\fR +Prefix the standard include paths with \fIdir\fR. +.IP \fB\-\-nostdinc\fR +Do not search standard include paths like /usr/include and +/usr/local/include. .PP .B Header options: .IP "\fB-h\fR"

1 0

Alexandre Julliard : widl: Add strmake() helper.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 264d8884d5d3c6ee4cfd5df5650293d841364166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=264d8884d5d3c6ee4cfd5df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:34:01 2019 +0100 widl: Add strmake() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 24 ++++-------------------- tools/widl/register.c | 3 +-- tools/widl/utils.c | 19 +++++++++++++++++++ tools/widl/utils.h | 1 + 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 59875a5b16..5f6eb50878 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2038,11 +2038,8 @@ var_t *find_const(const char *name, int f) char *gen_name(void) { - static const char format[] = "__WIDL_%s_generated_name_%08lX"; static unsigned long n = 0; static const char *file_id; - static size_t size; - char *name; if (! file_id) { @@ -2052,13 +2049,8 @@ char *gen_name(void) for (; *dst; ++dst) if (! isalnum((unsigned char) *dst)) *dst = '_'; - - size = sizeof format - 7 + strlen(file_id) + 8; } - - name = xmalloc(size); - sprintf(name, format, file_id, n++); - return name; + return strmake("__WIDL_%s_generated_name_%08lX", file_id, n++); } struct allowed_attr @@ -2727,14 +2719,6 @@ static void check_functions(const type_t *iface, int is_inside_library) } } -static char *concat_str(const char *prefix, const char *str) -{ - char *ret = xmalloc(strlen(prefix) + strlen(str) + 1); - strcpy(ret, prefix); - strcat(ret, str); - return ret; -} - static int async_iface_attrs(attr_list_t *attrs, const attr_t *attr) { switch(attr->type) @@ -2774,7 +2758,7 @@ static void check_async_uuid(type_t *iface) if (!inherit) error_loc("async_uuid applied to an interface with incompatible parent\n"); - async_iface = get_type(TYPE_INTERFACE, concat_str("Async", iface->name), iface->namespace, 0); + async_iface = get_type(TYPE_INTERFACE, strmake("Async%s", iface->name), iface->namespace, 0); async_iface->attrs = map_attrs(iface->attrs, async_iface_attrs); STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) @@ -2791,13 +2775,13 @@ static void check_async_uuid(type_t *iface) finish_args = append_var(finish_args, copy_var(arg, strdup(arg->name), arg_out_attrs)); } - begin_func = copy_var(func, concat_str("Begin_", func->name), NULL); + begin_func = copy_var(func, strmake("Begin_%s", func->name), NULL); begin_func->declspec.type = type_new_function(begin_args); begin_func->declspec.type->attrs = func->attrs; begin_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; stmts = append_statement(stmts, make_statement_declaration(begin_func)); - finish_func = copy_var(func, concat_str("Finish_", func->name), NULL); + finish_func = copy_var(func, strmake("Finish_%s", func->name), NULL); finish_func->declspec.type = type_new_function(finish_args); finish_func->declspec.type->attrs = func->attrs; finish_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; diff --git a/tools/widl/register.c b/tools/widl/register.c index 1c369e7c5e..f65cbddf53 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -321,8 +321,7 @@ void output_typelib_regscript( const typelib_t *typelib ) if (expr) { sprintf(id_part, "\\%d", expr->cval); - resname = xmalloc( strlen(typelib_name) + 20 ); - sprintf(resname, "%s\\%d", typelib_name, expr->cval); + resname = strmake("%s\\%d", typelib_name, expr->cval); } put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", lcid_expr ? lcid_expr->cval : 0, pointer_size == 8 ? "win64" : "win32", id_part ); diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 20c63064c7..ea92372c8c 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -226,6 +226,25 @@ void *xrealloc(void *p, size_t size) return res; } +char *strmake( const char* fmt, ... ) +{ + int n; + size_t size = 100; + va_list ap; + + for (;;) + { + char *p = xmalloc( size ); + va_start( ap, fmt ); + n = vsnprintf( p, size, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if ((size_t)n >= size) size = n + 1; + else return p; + free( p ); + } +} + char *xstrdup(const char *str) { char *s; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 74dba11d3c..3740665650 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -44,6 +44,7 @@ void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((forma void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); +char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); char *dup_basename(const char *name, const char *ext); size_t widl_getline(char **linep, size_t *lenp, FILE *fp);

1 0

Alexandre Julliard : wrc: Add --sysroot option.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 9240ffbb293a0ca998368f082dbda15767e8fa5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9240ffbb293a0ca998368f08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:33:36 2019 +0100 wrc: Add --sysroot option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 2 +- tools/wrc/wrc.c | 17 +++++++++++++++-- tools/wrc/wrc.man.in | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 500d5c1278..d502e4b7da 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,7 +15,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}/wine\"" +wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index ea8bfe07a7..014b177291 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -74,6 +74,7 @@ static const char usage[] = " --po-dir=DIR Directory containing po files for translations\n" " --preprocessor Specifies the preprocessor to use, including arguments\n" " -r Ignored for compatibility with rc\n" + " --sysroot=DIR Prefix include paths with DIR\n" " -U, --undefine id Undefine preprocessor identifier id\n" " --use-temp-file Ignored for compatibility with windres\n" " -v, --verbose Enable verbose mode\n" @@ -172,6 +173,7 @@ enum long_options_values LONG_OPT_NOTMPFILE, LONG_OPT_PO_DIR, LONG_OPT_PREPROCESSOR, + LONG_OPT_SYSROOT, LONG_OPT_VERSION, LONG_OPT_DEBUG, LONG_OPT_ENDIANNESS, @@ -197,6 +199,7 @@ static const struct option long_options[] = { { "pedantic", 0, NULL, LONG_OPT_PEDANTIC }, { "po-dir", 1, NULL, LONG_OPT_PO_DIR }, { "preprocessor", 1, NULL, LONG_OPT_PREPROCESSOR }, + { "sysroot", 1, NULL, LONG_OPT_SYSROOT }, { "target", 1, NULL, 'F' }, { "undefine", 1, NULL, 'U' }, { "use-temp-file", 0, NULL, LONG_OPT_TMPFILE }, @@ -335,6 +338,7 @@ int main(int argc,char *argv[]) int cmdlen; int po_mode = 0; char *po_dir = NULL; + const char *sysroot = ""; char **files = xmalloc( argc * sizeof(*files) ); signal(SIGSEGV, segvhandler); @@ -384,6 +388,9 @@ int main(int argc,char *argv[]) if (strcmp(optarg, "cat") == 0) no_preprocess = 1; else fprintf(stderr, "-P option not yet supported, ignored.\n"); break; + case LONG_OPT_SYSROOT: + sysroot = xstrdup( optarg ); + break; case LONG_OPT_VERSION: printf(version_string); exit(0); @@ -499,8 +506,14 @@ int main(int argc,char *argv[]) /* If we do need to search standard includes, add them to the path */ if (stdinc) { - wpp_add_include_path(INCLUDEDIR"/msvcrt"); - wpp_add_include_path(INCLUDEDIR"/windows"); + static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + + for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) + { + if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; + wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); + wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); + } } /* Kill io buffering when some kind of debuglevel is enabled */ diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index c671ad7382..80fcd04c5b 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -121,6 +121,9 @@ This option may be used to specify the preprocessor to use, including any leading arguments. If not specified, \fBwrc\fR uses its builtin processor. To disable preprocessing, use \fB--preprocessor=cat\fR. .TP +.I \fB\-\-sysroot=\fIdir\fR +Prefix the standard include paths with \fIdir\fR. +.TP .I \fB\-U\fR, \fB\-\-undefine\fR=\fIid\fR Undefine preprocessor identifier \fIid\fR. Please note that only macros defined up to this point are undefined by this command. However, these

1 0

Alexandre Julliard : ucrtbase/tests: Avoid C99 for loop.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: f282b4980210b1125e2af58b91752055edc59798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f282b4980210b1125e2af58b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 09:22:49 2019 +0100 ucrtbase/tests: Avoid C99 for loop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 2af29322bf..9c6ece9808 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -639,10 +639,11 @@ static void test_printf_legacy_three_digit_exp(void) static void test_printf_c99(void) { char buf[30]; + int i; /* The msvcrt compatibility flag doesn't affect whether 'z' is interpreted * as size_t size for integers. */ - for (int i = 0; i < 2; i++) { + for (i = 0; i < 2; i++) { unsigned __int64 options = (i == 0) ? 0 : UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY;

1 0

Francois Gouget : winetest: Disable indexing of the WineTest website.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: tools Branch: master Commit: 847a480e9d9597407ac33c27cf65505a8d688163 URL: https://source.winehq.org/git/tools.git/?a=commit;h=847a480e9d9597407ac33c2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Nov 3 00:44:22 2019 +0100 winetest: Disable indexing of the WineTest website. All the data on the website is transient in nature and not worth indexing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/robots.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/robots.txt b/winetest/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/winetest/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /

1 0

Francois Gouget : testbot/web: Disable indexing of the TestBot site.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: tools Branch: master Commit: dd327eaf94647fc7e3fab28061c42d691e91a298 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dd327eaf94647fc7e3fab28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Nov 3 00:40:57 2019 +0100 testbot/web: Disable indexing of the TestBot site. All the data on the website is transient in nature and not worth indexing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/robots.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/web/robots.txt b/testbot/web/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/testbot/web/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /

1 0

Alexandre Julliard : Wine release 4.19
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: website Branch: master Commit: 925f6be9da4197aad5822c9a73a6e70bbe9c704c URL: https://source.winehq.org/git/website.git/?a=commit;h=925f6be9da4197aad5822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 1 21:38:05 2019 +0100 Wine release 4.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019110101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019110101.xml b/news/en/2019110101.xml new file mode 100644 index 00000000..99e92e0f --- /dev/null +++ b/news/en/2019110101.xml @@ -0,0 +1,15 @@ +<news> +<date>November 1, 2019</date> +<title>Wine 4.19 Released</title> +<body> + The Wine development release 4.19 is now available. + <a href="{$root}/announce/4.19">What's new</a> in this release: +<ul> + <li>A number of additional VBScript features.</li> + <li>More stateblock support in WineD3D.</li> + <li>Some fixes for ARM64 support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.19 : Alexandre Julliard : Release 4.19
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: refs/tags/wine-4.19 Tag: 773efb2376b4b65fa9c1978c9dfa930fdce32d78 URL: https://source.winehq.org/git/wine.git/?a=tag;h=773efb2376b4b65fa9c1978c9df… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 1 21:35:58 2019 +0100 Release 4.19

1 0

Alexandre Julliard : Release 4.19.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 6f2ef158b78f7d0a950c9398c26278d6523c112e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f2ef158b78f7d0a950c9398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 1 21:35:58 2019 +0100 Release 4.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 843 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 434 insertions(+), 430 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f2ef158b78f7d0a950c…

1 0

Gijs Vermeulen : faultrep/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: d2e176f3a95f7eb906df623c01abfb8fca119dea URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2e176f3a95f7eb906df623c… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Nov 1 17:16:53 2019 +0100 faultrep/tests: Fix some memory leaks (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36404 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/tests/faultrep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index d45c606f1e..d0b30f70cf 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -64,6 +64,7 @@ static BOOL is_process_limited(void) trace("Could not check if the current user is an administrator\n"); return FALSE; } + FreeSid(Group); if (!IsInGroup) { if (!AllocateAndInitializeSid(&NtAuthority, 2, @@ -75,6 +76,7 @@ static BOOL is_process_limited(void) trace("Could not check if the current user is a power user\n"); return FALSE; } + FreeSid(Group); if (!IsInGroup) { /* Only administrators and power users can be powerful */

1 0

Ambrož Bizjak : ucrtbase: Implement t and j printf length modifiers.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 3b6b28bce5f2f05ba21d6ca5399517c22300aeeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6b28bce5f2f05ba21d6ca5… Author: Ambrož Bizjak <abizjak.pro(a)gmail.com> Date: Fri Nov 1 19:40:04 2019 +0100 ucrtbase: Implement t and j printf length modifiers. Signed-off-by: Ambroz Bizjak <abizjak.pro(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 6 +++++- dlls/ucrtbase/tests/printf.c | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 346fb5ac5d..975977087d 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -516,10 +516,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API } else if(*p == 'w') flags.WideString = *p++; #if _MSVCR_VER >= 140 - else if(*p == 'z') + else if(*p == 'z' || *p == 't') flags.IntegerNative = *p++; else if(*p == 'T') flags.NaturalString = *p++; + else if(*p == 'j') { + flags.IntegerDouble++; + p++; + } #endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 769121ebd9..2af29322bf 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <errno.h> #include <math.h> +#include <inttypes.h> #include "windef.h" #include "winbase.h" @@ -637,24 +638,35 @@ static void test_printf_legacy_three_digit_exp(void) static void test_printf_c99(void) { - char buf[20]; + char buf[30]; /* The msvcrt compatibility flag doesn't affect whether 'z' is interpreted * as size_t size for integers. */ - if (sizeof(void*) == 8) { - vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", - (size_t) 0x12345678123456, 1); - ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, - buf, sizeof(buf), "%zx %d", (size_t) 0x12345678123456, 1); - ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); - } else { - vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", - (size_t) 0x123456, 1); - ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, - buf, sizeof(buf), "%zx %d", (size_t) 0x123456, 1); - ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); + for (int i = 0; i < 2; i++) { + unsigned __int64 options = (i == 0) ? 0 : + UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; + + /* z modifier accepts size_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%zx %d", SIZE_MAX, 1); + if (sizeof(size_t) == 8) + ok(!strcmp(buf, "ffffffffffffffff 1"), "buf = %s\n", buf); + else + ok(!strcmp(buf, "ffffffff 1"), "buf = %s\n", buf); + + /* j modifier with signed format accepts intmax_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%jd %d", INTMAX_MIN, 1); + ok(!strcmp(buf, "-9223372036854775808 1"), "buf = %s\n", buf); + + /* j modifier with unsigned format accepts uintmax_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%ju %d", UINTMAX_MAX, 1); + ok(!strcmp(buf, "18446744073709551615 1"), "buf = %s\n", buf); + + /* t modifier accepts ptrdiff_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%td %d", PTRDIFF_MIN, 1); + if (sizeof(ptrdiff_t) == 8) + ok(!strcmp(buf, "-9223372036854775808 1"), "buf = %s\n", buf); + else + ok(!strcmp(buf, "-2147483648 1"), "buf = %s\n", buf); } }

1 0

Jacek Caban : vbscript: Support using function return value in expressions.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: ef737598e6b029a1af6c61e4cf8905c48ff63d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef737598e6b029a1af6c61e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:55:31 2019 +0100 vbscript: Support using function return value in expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 5 ++--- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8568b7098c..7339f42aba 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -104,9 +104,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if(invoke_type == VBDISP_LET - && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) - && !wcsicmp(name, ctx->func->name)) { + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; return S_OK; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5d8e02a7ab..4623a08e2b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1621,4 +1621,13 @@ with new TestPropSyntax ok .prop = 1, ".prop = "&.prop end with +function testsetresult(x, y) + set testsetresult = new TestPropSyntax + testsetresult.prop = x + y = testsetresult.prop + 1 +end function + +set x = testsetresult(1, 2) +ok x.prop = 1, "x.prop = " & x.prop + reportSuccess()

1 0

Jacek Caban : vbscript/tests: Add redim statement tests.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 39e79c76c9e6551f60dab5a35e2d865f8b90294f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e79c76c9e6551f60dab5a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:55:23 2019 +0100 vbscript/tests: Add redim statement tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 31 ++++++++++++++++++++++++++++++- dlls/vbscript/tests/run.c | 2 ++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8a6fa7834b..5d8e02a7ab 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -18,7 +18,7 @@ OPTION EXPLICIT : : DIM W -dim x, y, z +dim x, y, z, e Dim obj call ok(true, "true is not true?") @@ -1316,11 +1316,38 @@ end sub x = Array(1) changearg x(0) ok x(0) = 2, "x(0) = " & x(0) +ok getVT(x) = "VT_ARRAY|VT_VARIANT*", "getVT(x) after redim = " & getVT(x) x = Array(1) changearg (x(0)) ok x(0) = 1, "x(0) = " & x(0) +x = Array(1) +redim x(4) +ok ubound(x) = 4, "ubound(x) = " & ubound(x) +ok x(0) = empty, "x(0) = " & x(0) + +x = 1 +redim x(3) +ok ubound(x) = 3, "ubound(x) = " & ubound(x) + +x = Array(1, 2) +redim x(-1) +ok lbound(x) = 0, "lbound(x) = " & lbound(x) +ok ubound(x) = -1, "ubound(x) = " & ubound(x) + +redim x(3, 2) +ok ubound(x) = 3, "ubound(x) = " & ubound(x) +ok ubound(x, 1) = 3, "ubound(x, 1) = " & ubound(x, 1) +ok ubound(x, 2) = 2, "ubound(x, 2) = " & ubound(x, 2) & " expected 2" + +dim staticarray(4) +on error resume next +redim staticarray(3) +e = err.number +on error goto 0 +todo_wine_ok e = 10, "e = " & e + Class ArrClass Dim classarr(3) Dim classnoarr() @@ -1523,6 +1550,8 @@ sub test_dotIdentifiers Call ok(testObj.resume = 10, "testObj.resume = " & testObj.resume & " expected 10") Call ok(testObj.goto = 10, "testObj.goto = " & testObj.goto & " expected 10") Call ok(testObj.with = 10, "testObj.with = " & testObj.with & " expected 10") + Call ok(testObj.redim = 10, "testObj.redim = " & testObj.redim & " expected 10") + Call ok(testObj.preserve = 10, "testObj.preserve = " & testObj.preserve & " expected 10") end sub call test_dotIdentifiers diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 527055f83b..208d647d46 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -856,6 +856,8 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"on", DISPID_TESTOBJ_KEYWORD }, { L"resume", DISPID_TESTOBJ_KEYWORD }, { L"goto", DISPID_TESTOBJ_KEYWORD }, + { L"redim", DISPID_TESTOBJ_KEYWORD }, + { L"preserve", DISPID_TESTOBJ_KEYWORD }, { L"with", DISPID_TESTOBJ_KEYWORD } };

1 0

Jacek Caban : vbscript: Add interpreter support for redim statement.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 5cb1631fe221e981d68d7c1b1555c67f1cf6fd28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cb1631fe221e981d68d7c1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:51:11 2019 +0100 vbscript: Add interpreter support for redim statement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 20 +++++++++++++++ dlls/vbscript/interp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 86 insertions(+) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 07279794c6..90b0cf5342 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1122,6 +1122,23 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) return S_OK; } +static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *stat) +{ + unsigned arg_cnt; + HRESULT hres; + + if(stat->preserve) { + FIXME("Preserving redim not supported\n"); + return E_NOTIMPL; + } + + hres = compile_args(ctx, stat->dims, &arg_cnt); + if(FAILED(hres)) + return hres; + + return push_instr_bstr_uint(ctx, OP_redim, stat->identifier, arg_cnt); +} + static HRESULT compile_const_statement(compile_ctx_t *ctx, const_statement_t *stat) { const_decl_t *decl, *next_decl = stat->decls; @@ -1344,6 +1361,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_ONERROR: hres = compile_onerror_statement(ctx, (onerror_statement_t*)stat); break; + case STAT_REDIM: + hres = compile_redim_statement(ctx, (redim_statement_t*)stat); + break; case STAT_SELECT: hres = compile_select_statement(ctx, (select_statement_t*)stat); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 97360f9b22..8568b7098c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1145,6 +1145,71 @@ static HRESULT interp_dim(exec_ctx_t *ctx) return S_OK; } +static HRESULT array_bounds_from_stack(exec_ctx_t *ctx, unsigned dim_cnt, SAFEARRAYBOUND **ret) +{ + SAFEARRAYBOUND *bounds; + unsigned i; + int dim; + HRESULT hres; + + if(!(bounds = heap_alloc(dim_cnt * sizeof(*bounds)))) + return E_OUTOFMEMORY; + + for(i = 0; i < dim_cnt; i++) { + hres = to_int(stack_top(ctx, dim_cnt - i - 1), &dim); + if(FAILED(hres)) { + heap_free(bounds); + return hres; + } + + bounds[i].cElements = dim + 1; + bounds[i].lLbound = 0; + } + + stack_popn(ctx, dim_cnt); + *ret = bounds; + return S_OK; +} + +static HRESULT interp_redim(exec_ctx_t *ctx) +{ + BSTR identifier = ctx->instr->arg1.bstr; + const unsigned dim_cnt = ctx->instr->arg2.uint; + SAFEARRAYBOUND *bounds; + SAFEARRAY *array; + ref_t ref; + HRESULT hres; + + TRACE("%s %u\n", debugstr_w(identifier), dim_cnt); + + hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres); + return hres; + } + + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); + if(FAILED(hres)) + return hres; + + array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); + heap_free(bounds); + if(!array) + return E_OUTOFMEMORY; + + /* FIXME: We should check if we're not modifying an existing static array here */ + + VariantClear(ref.u.v); + V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(ref.u.v) = array; + return S_OK; +} + static HRESULT interp_step(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg2.bstr; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index fefed63edb..2d9647eb2e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -263,6 +263,7 @@ typedef enum { X(null, 1, 0, 0) \ X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ + X(redim, 1, ARG_BSTR, ARG_UINT) \ X(ret, 0, 0, 0) \ X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \

1 0

Jacek Caban : vbscript: Add parser support for redim statement.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 7e420a475e653f46970650dcbf65e860c1d3fc1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e420a475e653f46970650dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:50:57 2019 +0100 vbscript: Add parser support for redim statement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 2 ++ dlls/vbscript/parse.h | 8 ++++++++ dlls/vbscript/parser.y | 28 ++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index d8c5ed3004..f78eee4ff9 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -72,9 +72,11 @@ static const struct { {L"on", tON}, {L"option", tOPTION}, {L"or", tOR}, + {L"preserve", tPRESERVE}, {L"private", tPRIVATE}, {L"property", tPROPERTY}, {L"public", tPUBLIC}, + {L"redim", tREDIM}, {L"rem", tREM}, {L"resume", tRESUME}, {L"select", tSELECT}, diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f4f8a5e5e2..4bf82cbedb 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -120,6 +120,7 @@ typedef enum { STAT_FUNC, STAT_IF, STAT_ONERROR, + STAT_REDIM, STAT_SELECT, STAT_SET, STAT_STOP, @@ -165,6 +166,13 @@ typedef struct _dim_statement_t { dim_decl_t *dim_decls; } dim_statement_t; +typedef struct { + statement_t stat; + const WCHAR *identifier; + BOOL preserve; + expression_t *dims; +} redim_statement_t; + typedef struct _arg_decl_t { const WCHAR *name; BOOL by_ref; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8bb99f9f9a..46af0b16be 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -51,6 +51,7 @@ static statement_t *new_call_statement(parser_ctx_t*,BOOL,expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,expression_t*,expression_t*); static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); +static statement_t *new_redim_statement(parser_ctx_t*,const WCHAR*,BOOL,expression_t*); static statement_t *new_while_statement(parser_ctx_t*,statement_type_t,expression_t*,statement_t*); static statement_t *new_forto_statement(parser_ctx_t*,const WCHAR*,expression_t*,expression_t*,expression_t*,statement_t*); static statement_t *new_foreach_statement(parser_ctx_t*,const WCHAR*,expression_t*,statement_t*); @@ -112,7 +113,8 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <string> tTRUE tFALSE %token <string> tNOT tAND tOR tXOR tEQV tIMP %token <string> tIS tMOD -%token <string> tCALL tDIM tSUB tFUNCTION tGET tLET tCONST +%token <string> tCALL tSUB tFUNCTION tGET tLET tCONST +%token <string> tDIM tREDIM tPRESERVE %token <string> tIF tELSE tELSEIF tEND tTHEN tEXIT %token <string> tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN %token <string> tSELECT tCASE tWITH @@ -133,7 +135,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression %type <expression> Arguments Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList -%type <boolean> OptionExplicit_opt DoType +%type <boolean> OptionExplicit_opt DoType Preserve_opt %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf @@ -194,6 +196,8 @@ SimpleStatement | CallExpression '=' Expression { $$ = new_assign_statement(ctx, $1, $3); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } + | tREDIM Preserve_opt tIdentifier '(' ArgumentList ')' + { $$ = new_redim_statement(ctx, $3, $2, $5); CHECK_ERROR; } | IfStatement { $$ = $1; } | tWHILE Expression StSep StatementsNl_opt tWEND { $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; } @@ -231,6 +235,10 @@ MemberExpression | tDOT DotIdentifier { expression_t *dot_expr = new_expression(ctx, EXPR_DOT, sizeof(*dot_expr)); CHECK_ERROR; $$ = new_member_expression(ctx, dot_expr, $2); CHECK_ERROR; } +Preserve_opt + : /* empty */ { $$ = FALSE; } + | tPRESERVE { $$ = TRUE; } + DimDeclList : DimDecl { $$ = $1; } | DimDecl ',' DimDeclList { $1->next = $3; $$ = $1; } @@ -537,6 +545,8 @@ DotIdentifier | tRESUME { $$ = $1; } | tGOTO { $$ = $1; } | tWITH { $$ = $1; } + | tREDIM { $$ = $1; } + | tPRESERVE { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep @@ -864,6 +874,20 @@ static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) return &stat->stat; } +static statement_t *new_redim_statement(parser_ctx_t *ctx, const WCHAR *identifier, BOOL preserve, expression_t *dims) +{ + redim_statement_t *stat; + + stat = new_statement(ctx, STAT_REDIM, sizeof(*stat)); + if(!stat) + return NULL; + + stat->identifier = identifier; + stat->preserve = preserve; + stat->dims = dims; + return &stat->stat; +} + static elseif_decl_t *new_elseif_decl(parser_ctx_t *ctx, expression_t *expr, statement_t *stat) { elseif_decl_t *decl;

1 0

Jacek Caban : vbscript: Allow 'with' as an identifier.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 37e27296076ee1067f5409d3fd408a11ef4e69b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e27296076ee1067f5409d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:50:45 2019 +0100 vbscript: Allow 'with' as an identifier. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/tests/run.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index ffa12b2c4e..8bb99f9f9a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -536,6 +536,7 @@ DotIdentifier | tON { $$ = $1; } | tRESUME { $$ = $1; } | tGOTO { $$ = $1; } + | tWITH { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0520038a02..8a6fa7834b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1522,6 +1522,7 @@ sub test_dotIdentifiers Call ok(testObj.on = 10, "testObj.on = " & testObj.on & " expected 10") Call ok(testObj.resume = 10, "testObj.resume = " & testObj.resume & " expected 10") Call ok(testObj.goto = 10, "testObj.goto = " & testObj.goto & " expected 10") + Call ok(testObj.with = 10, "testObj.with = " & testObj.with & " expected 10") end sub call test_dotIdentifiers diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 765a0353d1..527055f83b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -855,7 +855,8 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"next", DISPID_TESTOBJ_KEYWORD }, { L"on", DISPID_TESTOBJ_KEYWORD }, { L"resume", DISPID_TESTOBJ_KEYWORD }, - { L"goto", DISPID_TESTOBJ_KEYWORD } + { L"goto", DISPID_TESTOBJ_KEYWORD }, + { L"with", DISPID_TESTOBJ_KEYWORD } }; test_grfdex(grfdex, fdexNameCaseInsensitive);

1 0

Jacek Caban : vbscript: Add support for parameterized set statements.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: aad0340c8f339cd0a676d932e4c4d9394ccf2951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad0340c8f339cd0a676d932… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:50:37 2019 +0100 vbscript: Add support for parameterized set statements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 15 +++++---------- dlls/vbscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index ad6454aa57..97360f9b22 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -872,23 +872,18 @@ static HRESULT interp_set_ident(exec_ctx_t *ctx) DISPPARAMS dp; HRESULT hres; - TRACE("%s\n", debugstr_w(arg)); - - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } + TRACE("%s %u\n", debugstr_w(arg), arg_cnt); - hres = stack_assume_disp(ctx, 0, NULL); + hres = stack_assume_disp(ctx, arg_cnt, NULL); if(FAILED(hres)) return hres; - vbstack_to_dp(ctx, 0, TRUE, &dp); - hres = assign_ident(ctx, ctx->instr->arg1.bstr, DISPATCH_PROPERTYPUTREF, &dp); + vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); + hres = assign_ident(ctx, arg, DISPATCH_PROPERTYPUTREF, &dp); if(FAILED(hres)) return hres; - stack_popn(ctx, 1); + stack_popn(ctx, arg_cnt + 1); return S_OK; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9354cae309..765a0353d1 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -104,6 +104,8 @@ DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); +DEFINE_EXPECT(global_propargset_d); +DEFINE_EXPECT(global_propargset_i); DEFINE_EXPECT(global_testoptionalarg_i); DEFINE_EXPECT(global_testerrorobject_i); DEFINE_EXPECT(collectionobj_newenum_i); @@ -140,6 +142,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_GLOBALCALLBACK 1022 #define DISPID_GLOBAL_TESTERROROBJECT 1023 #define DISPID_GLOBAL_THROWWITHDESC 1024 +#define DISPID_GLOBAL_PROPARGSET 1025 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1101,6 +1104,7 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"RefObj", DISPID_GLOBAL_REFOBJ }, { L"propargput", DISPID_GLOBAL_PROPARGPUT, REF_EXPECT(global_propargput_d) }, { L"propargput1", DISPID_GLOBAL_PROPARGPUT1, REF_EXPECT(global_propargput1_d) }, + { L"propargset", DISPID_GLOBAL_PROPARGSET, REF_EXPECT(global_propargset_d) }, { L"counter", DISPID_GLOBAL_COUNTER }, { L"doubleAsString", DISPID_GLOBAL_DOUBLEASSTRING }, { L"testArray", DISPID_GLOBAL_TESTARRAY }, @@ -1389,6 +1393,27 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_PROPARGSET: + CHECK_EXPECT(global_propargset_i); + + ok(wFlags == DISPATCH_PROPERTYPUTREF, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_DISPATCH(pdp->rgvarg) == (IDispatch*)&testObj, "V_DISPATCH(psp->rgvargs) = %p\n", V_DISPATCH(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+1) == VT_I2, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I2(pdp->rgvarg+1) == 0, "V_I2(psp->rgvargs+1) = %d\n", V_I2(pdp->rgvarg+1)); + + return S_OK; + case DISPID_GLOBAL_COUNTER: ok(pdp != NULL, "pdp == NULL\n"); todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); @@ -2835,6 +2860,12 @@ static void run_tests(void) CHECK_CALLED(global_propargput1_d); CHECK_CALLED(global_propargput1_i); + SET_EXPECT(global_propargset_d); + SET_EXPECT(global_propargset_i); + parse_script_a("set propargset (counter()) = testObj"); + CHECK_CALLED(global_propargset_d); + CHECK_CALLED(global_propargset_i); + SET_EXPECT(testobj_propget_d); SET_EXPECT(testobj_propget_i); parse_script_a("dim x\nwith testObj\nx=1+.propget\nend with");

1 0

Vijay Kiran Kamuju : ucrtbase/tests: Add tests for strftime formats %r and %V.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: ea1398382c2ae319045fe7118fbaba0f9372f6d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1398382c2ae319045fe711… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Nov 1 10:16:05 2019 +0100 ucrtbase/tests: Add tests for strftime formats %r and %V. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 8a6fb7b8e1..3a1598fee2 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -904,6 +904,7 @@ static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; + const struct tm tm2 = { 0, 0, 14, 1, 0, 121, 6, 0, 0 }; char bufA[256]; size_t retA; int i; @@ -964,6 +965,14 @@ static void test_strftime(void) ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\n"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%r", &epoch); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "12:00:00 AM"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%r", &tm2); + todo_wine ok(retA == 11, "expected 11, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "02:00:00 PM"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); @@ -984,6 +993,18 @@ static void test_strftime(void) ok(retA == 4, "expected 4, got %d\n", (int)retA); ok(!strcmp(bufA, "2016"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%V", &epoch); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm1); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "52"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%V", &tm2); + todo_wine ok(retA == 2, "expected 2, got %d\n", (int)retA); + todo_wine ok(!strcmp(bufA, "53"), "got %s\n", bufA); + for(i=0; i<14; i++) { __time32_t t = (365*2 + i - 7) * 24 * 60 * 60;

1 0

Byeongsik Jeon : po: Update Korean tranlation.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: fde9de91dfb7eb50c0e912a930c6739526b93ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde9de91dfb7eb50c0e912a9… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Fri Nov 1 16:58:15 2019 +0900 po: Update Korean tranlation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 688 ++++++++++++++++++++++----------------------------------------- 1 file changed, 239 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fde9de91dfb7eb50c0e9…

1 0

Fabian Maurer : find: Prevent hang by properly checking for EOF.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 93c98111aee7d96a1150657d9220d32f2f06e745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93c98111aee7d96a1150657d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Nov 1 16:02:41 2019 +0100 find: Prevent hang by properly checking for EOF. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/find/find.c b/programs/find/find.c index 3794a8190f..34ca2801eb 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -36,7 +36,7 @@ static BOOL read_char_from_handle(HANDLE handle, char *char_out) if (buffer_pos >= buffer_max) { BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); - if (!success) + if (!success || !buffer_max) return FALSE; buffer_pos = 0; }

1 0

Hans Leidekker : shell32: Improve the stub for SHGetPropertyStoreForWindow.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: d7533e28df9ffa8303e8d53337dfe8d68e423eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7533e28df9ffa8303e8d533… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 1 14:13:00 2019 +0100 shell32: Improve the stub for SHGetPropertyStoreForWindow. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 112 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/appbar.c | 32 +++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 99ee110b3d..034805f6fb 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -691,13 +691,123 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) FIXME("(%p, %p) stub!\n", hClassPidl, hwnd); } +struct window_prop_store +{ + IPropertyStore IPropertyStore_iface; + LONG ref; +}; + +static inline struct window_prop_store *impl_from_IPropertyStore(IPropertyStore *iface) +{ + return CONTAINING_RECORD(iface, struct window_prop_store, IPropertyStore_iface); +} + +static ULONG WINAPI window_prop_store_AddRef(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedIncrement(&store->ref); + TRACE("returning %d\n", ref); + return ref; +} + +static ULONG WINAPI window_prop_store_Release(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedDecrement(&store->ref); + if (!ref) heap_free(store); + TRACE("returning %d\n", ref); + return ref; +} + +static HRESULT WINAPI window_prop_store_QueryInterface(IPropertyStore *iface, REFIID iid, void **obj) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + TRACE("%p, %s, %p\n", iface, debugstr_guid(iid), obj); + + if (!obj) return E_POINTER; + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPropertyStore)) + { + *obj = &store->IPropertyStore_iface; + } + else + { + FIXME("no interface for %s\n", debugstr_guid(iid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_GetCount(IPropertyStore *iface, DWORD *count) +{ + FIXME("%p, %p\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetAt(IPropertyStore *iface, DWORD prop, PROPERTYKEY *key) +{ + FIXME("%p, %u,%p\n", iface, prop, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetValue(IPropertyStore *iface, const PROPERTYKEY *key, PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_SetValue(IPropertyStore *iface, const PROPERTYKEY *key, const PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_Commit(IPropertyStore *iface) +{ + FIXME("%p\n", iface); + return S_OK; +} + +static const IPropertyStoreVtbl window_prop_store_vtbl = +{ + window_prop_store_QueryInterface, + window_prop_store_AddRef, + window_prop_store_Release, + window_prop_store_GetCount, + window_prop_store_GetAt, + window_prop_store_GetValue, + window_prop_store_SetValue, + window_prop_store_Commit +}; + +static HRESULT create_window_prop_store(IPropertyStore **obj) +{ + struct window_prop_store *store; + + if (!(store = heap_alloc(sizeof(*store)))) return E_OUTOFMEMORY; + store->IPropertyStore_iface.lpVtbl = &window_prop_store_vtbl; + store->ref = 1; + + *obj = &store->IPropertyStore_iface; + return S_OK; +} + /************************************************************************* * SHGetPropertyStoreForWindow [SHELL32.@] */ HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) { + IPropertyStore *store; + HRESULT hr; + FIXME("(%p %p %p) stub!\n", hwnd, riid, ppv); - return E_NOTIMPL; + + if ((hr = create_window_prop_store( &store )) != S_OK) return hr; + hr = IPropertyStore_QueryInterface( store, riid, ppv ); + IPropertyStore_Release( store ); + return hr; } /*************************************************************************/ diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 1505a40aeb..229d616c6f 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -21,6 +21,8 @@ #include <windows.h> #include "shellapi.h" +#define COBJMACROS +#include "propsys.h" #include "wine/test.h" @@ -30,6 +32,7 @@ static const CHAR testwindow_class[] = "testwindow"; static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD); static HRESULT (WINAPI *pGetCurrentProcessExplicitAppUserModelID)(PWSTR*); +static HRESULT (WINAPI *pSHGetPropertyStoreForWindow)(HWND, REFIID, void **); typedef BOOL (*boolean_function)(void); @@ -433,6 +436,33 @@ todo_wine ok(appid == NULL, "got %p\n", appid); } +static void test_SHGetPropertyStoreForWindow(void) +{ + HRESULT hr; + IUnknown *unk; + IPropertyStore *store = NULL; + + if (!pSHGetPropertyStoreForWindow) + { + win_skip("SHGetPropertyStoreForWindow() is not supported.\n"); + return; + } + + unk = (IUnknown *)0xdeadbeef; + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IDispatch, (void **)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(unk == NULL, "got %p\n", unk); + + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IPropertyStore, (void **)&store); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (store) IPropertyStore_Release(store); + if (unk) IUnknown_Release(unk); +} + START_TEST(appbar) { HMODULE huser32, hshell32; @@ -441,10 +471,12 @@ START_TEST(appbar) hshell32 = GetModuleHandleA("shell32.dll"); pMonitorFromWindow = (void*)GetProcAddress(huser32, "MonitorFromWindow"); pGetCurrentProcessExplicitAppUserModelID = (void*)GetProcAddress(hshell32, "GetCurrentProcessExplicitAppUserModelID"); + pSHGetPropertyStoreForWindow = (void*)GetProcAddress(hshell32, "SHGetPropertyStoreForWindow"); register_testwindow_class(); test_setpos(); test_appbarget(); test_GetCurrentProcessExplicitAppUserModelID(); + test_SHGetPropertyStoreForWindow(); }

1 0

Sven Baars : ole32/tests: Fix some test failures on Windows XP.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: b21e50c08551302d0c71ff851b553839886cd157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21e50c08551302d0c71ff85… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Nov 1 16:30:44 2019 +0100 ole32/tests: Fix some test failures on Windows XP. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 69a38d48b2..8412ee45a0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -757,7 +757,7 @@ static void test_CoGetClassObject(void) IUnknown_Release(pUnk); hr = CoGetClassObject(&IID_Testiface7, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + ok(hr == 0x80001235 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); hr = CoGetClassObject(&IID_Testiface8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); @@ -1573,7 +1573,7 @@ static void test_CoRegisterClassObject(void) if ((handle = activate_context(actctx_manifest, &ctxcookie))) { hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&pcf); - ok(hr == 0x80001234, "Unexpected hr %#x.\n", hr); + ok(hr == 0x80001234 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); deactivate_context(handle, ctxcookie); }

1 0

Paul Gofman : wined3d: Return TRUE for NULL SRV format from wined3d_dsv_srv_conflict().
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: eefc2a9c64337c418d847b8e914ab31fddd538eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eefc2a9c64337c418d847b8e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Nov 1 11:02:43 2019 +0300 wined3d: Return TRUE for NULL SRV format from wined3d_dsv_srv_conflict(). This undoes unintended change of wined3d_resource_check_fbo_attached() behaviour for pre-10.0 APIs. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82161c9034..61096a0345 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5292,8 +5292,8 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { - return srv_format && ((srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) - || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL))); + return !srv_format || (srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) + || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state,

1 0

Paul Gofman : d3d11/tests: Require D3D_FEATURE_LEVEL_11_0 for using DSV flags.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 484e3f9c4ca698e8473b26c8ac0ae0ff42094034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=484e3f9c4ca698e8473b26c8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Nov 1 11:02:42 2019 +0300 d3d11/tests: Require D3D_FEATURE_LEVEL_11_0 for using DSV flags. Fixes test failures on older Testbot Windows versions in test_sample_attached_rtv(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d23cb15d82..1dbd405001 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29403,6 +29403,7 @@ static void test_sample_attached_rtv(void) struct d3d11_test_context test_context; ID3D11RenderTargetView *rtv, *rtvs[2]; D3D11_TEXTURE2D_DESC texture_desc; + D3D_FEATURE_LEVEL feature_level; D3D11_SAMPLER_DESC sampler_desc; ID3D11DepthStencilView *dsview; ID3D11BlendState *blend_state; @@ -29486,6 +29487,8 @@ static void test_sample_attached_rtv(void) device = test_context.device; context = test_context.immediate_context; + feature_level = ID3D11Device_GetFeatureLevel(device); + texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT; @@ -29655,6 +29658,16 @@ static void test_sample_attached_rtv(void) for (i = 0; i < ARRAY_SIZE(ds_tests); ++i) { + if (ds_tests[i].dsv_flags && feature_level < D3D_FEATURE_LEVEL_11_0) + { + static unsigned int skip_once; + + if (!skip_once++) + skip("Read only depths or stencils are not supported.\n"); + + continue; + } + texture_desc.Format = ds_tests[i].texture_format; hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dstexture); ok(hr == S_OK, "Test %u, got unexpected hr %#x.\n", i, hr);

1 0

Zhiyi Zhang : winex11.drv: Handle display device events in the desktop thread.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 413aad39135b0b0f8255500b85fcc05337a5f138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=413aad39135b0b0f8255500b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 1 21:20:21 2019 +0800 winex11.drv: Handle display device events in the desktop thread. This fixes a regression from 22795243b2d21e1a667215f54c3a15634735749c, which calls thread_init_display() and eventually XOpenIM() before X11DRV_InitXIM() is called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47821 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 6 ++++++ dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 5 +++++ dlls/winex11.drv/xinerama.c | 1 + dlls/winex11.drv/xrandr.c | 35 +++++++++++++++++++++++------------ 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a323b795b8..ee867343ae 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -241,6 +241,12 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +void X11DRV_DisplayDevices_RegisterEventHandlers(void) +{ + if (handler.register_event_handlers) + handler.register_event_handlers(); +} + /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e01eb201c..f3c6a1b3cb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1833,6 +1833,7 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) XFlush( data->display ); SetPropA( hwnd, clip_window_prop, (HANDLE)data->clip_window ); X11DRV_InitClipboard(); + X11DRV_DisplayDevices_RegisterEventHandlers(); } return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a06cf3ffd8..35e27334db 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -743,10 +743,15 @@ struct x11drv_display_device_handler /* free_monitors will be called to free a monitor list from get_monitors */ void (*free_monitors)(struct x11drv_monitor *monitors); + + /* register_event_handlers will be called to register event handlers. + * This function pointer is optional and can be NULL when driver doesn't support it */ + void (*register_event_handlers)(void); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b5620d3403..57c77d6273 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -344,5 +344,6 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.free_gpus = xinerama_free_gpus; handler.free_adapters = xinerama_free_adapters; handler.free_monitors = xinerama_free_monitors; + handler.register_event_handlers = NULL; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 412400e3f6..0a64613fac 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1063,10 +1063,29 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } -static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { - X11DRV_DisplayDevices_Init( TRUE ); - return TRUE; + if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) + X11DRV_DisplayDevices_Init( TRUE ); + return FALSE; +} + +static void xrandr14_register_event_handlers(void) +{ + Display *display = thread_init_display(); + int event_base, error_base; + + if (!pXRRQueryExtension( display, &event_base, &error_base )) + return; + + pXRRSelectInput( display, root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask ); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_handler, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_handler, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_handler, + "XRandR ProviderChange" ); } #endif @@ -1115,16 +1134,8 @@ void X11DRV_XRandR_Init(void) handler.free_gpus = xrandr14_free_gpus; handler.free_adapters = xrandr14_free_adapters; handler.free_monitors = xrandr14_free_monitors; + handler.register_event_handlers = xrandr14_register_event_handlers; X11DRV_DisplayDevices_SetHandler( &handler ); - - pXRRSelectInput( thread_init_display(), root_window, - RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); - X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, - "XRandR CrtcChange" ); - X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, - "XRandR OutputChange" ); - X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, - "XRandR ProviderChange" ); } #endif }

1 0

Zhiyi Zhang : winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 9ae8da6bb4a8f66d55975fa0f14e5e413756d324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae8da6bb4a8f66d55975fa0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 1 21:19:34 2019 +0800 winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI. So that a process can still get the correct virtual and primary monitor rectangles if display devices are reinitialized in another process. Note that we can't use EnumDisplayMonitor() and GetMonitorInfo() here because they are not loaded when loading winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 160 ++++++++++++++++++++++++++++++--------------- 1 file changed, 107 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6c4097a790..a323b795b8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,33 +104,132 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; + +/* Cached screen information, protected by screen_section */ +static HKEY video_key; static RECT virtual_screen_rect; static RECT primary_monitor_rect; +static FILETIME last_query_screen_time; +static CRITICAL_SECTION screen_section; +static CRITICAL_SECTION_DEBUG screen_critsect_debug = +{ + 0, 0, &screen_section, + {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} +}; +static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; + +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Update screen rectangle cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ +static BOOL update_screen_cache(void) +{ + RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + FILETIME filetime = {0}; + HANDLE mutex = NULL; + DWORD i = 0; + INT result; + DWORD type; + BOOL ret = FALSE; + + EnterCriticalSection(&screen_section); + if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) + || RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime)) + { + LeaveCriticalSection(&screen_section); + return FALSE; + } + result = CompareFileTime(&filetime, &last_query_screen_time); + LeaveCriticalSection(&screen_section); + if (result < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto fail; + + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) + goto fail; + + UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); + if (i == 1) + primary_rect = monitor_rect; + } + + EnterCriticalSection(&screen_section); + virtual_screen_rect = virtual_rect; + primary_monitor_rect = primary_rect; + last_query_screen_time = filetime; + LeaveCriticalSection(&screen_section); + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + if (!ret) + WARN("Update screen cache failed!\n"); + return ret; +} POINT virtual_screen_to_root(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; + + pt.x = x - virtual.left; + pt.y = y - virtual.top; return pt; } POINT root_to_virtual_screen(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; + + pt.x = x + virtual.left; + pt.y = y + virtual.top; return pt; } RECT get_virtual_screen_rect(void) { - return virtual_screen_rect; + RECT virtual; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + virtual = virtual_screen_rect; + LeaveCriticalSection(&screen_section); + return virtual; } RECT get_primary_monitor_rect(void) { - return primary_monitor_rect; + RECT primary; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + primary = primary_monitor_rect; + LeaveCriticalSection(&screen_section); + return primary; } void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) @@ -321,9 +420,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); - if (video_index == 0) - primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -348,9 +444,6 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; - SetRectEmpty(&virtual_screen_rect); - SetRectEmpty(&primary_monitor_rect); - /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -399,39 +492,8 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -/* Initialize virtual screen rect and primary monitor rect for current process */ -static void init_screen_rects(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo; - DWORD type; - DWORD i = 0; - RECT rect; - - /* Already initialized */ - if (!IsRectEmpty(&virtual_screen_rect)) - return; - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, - sizeof(rect), NULL, 0)) - ERR("Failed to get monitor size property\n"); - - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); - if (i == 1) - primary_monitor_rect = rect; - } - SetupDiDestroyDeviceInfoList(devinfo); - - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); -} - void X11DRV_DisplayDevices_Init(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -445,8 +507,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -457,10 +518,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) - { - init_screen_rects(); goto done; - } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -511,16 +569,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); - done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); if (gpus) handler.free_gpus(gpus); if (adapters)

1 0

Piotr Caban : msvcrt: Add printf meaningless digits tests.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: f87b3750fc877935336cee2bbf8a6bf41e55836c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87b3750fc877935336cee2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:46 2019 +0100 msvcrt: Add printf meaningless digits tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 5ce4015440..ac5c37a59c 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -248,6 +248,8 @@ static void test_sprintf( void ) { "%.0f", "-1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, -0.5 }, { "%.0f", "1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 0.5 }, { "%.0f", "2", 0, DOUBLE_ARG, 0, 0, 1.5 }, + { "%.30f", "0.333333333333333310000000000000", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 1.0/3.0 }, + { "%.30lf", "1.414213562373095100000000000000", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, sqrt(2) }, }; char buffer[100];

1 0

Piotr Caban : msvcrt: Add printf rounding tests.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 04a5beac69faef994a6706356c9ef67ff9d4c9ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a5beac69faef994a670635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:42 2019 +0100 msvcrt: Add printf rounding tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index bfdab8cc6b..5ce4015440 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -243,7 +243,11 @@ static void test_sprintf( void ) { "%C", "", 0, INT_ARG, 0x3042 }, { "a%Cb", "ab", 0, INT_ARG, 0x3042 }, { "%lld", "-8589934591", "1", ULONGLONG_ARG, 0, ((ULONGLONG)0xffffffff)*0xffffffff }, - { "%I32d", "1", "I32d", INT_ARG, 1 } + { "%I32d", "1", "I32d", INT_ARG, 1 }, + { "%.0f", "-2", 0, DOUBLE_ARG, 0, 0, -1.5 }, + { "%.0f", "-1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, -0.5 }, + { "%.0f", "1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 0.5 }, + { "%.0f", "2", 0, DOUBLE_ARG, 0, 0, 1.5 }, }; char buffer[100];

1 0

Piotr Caban : msvcrt: Move more printf tests to table.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 3798c0c4c92e588d8c217fbfb8b753eaa96c800d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3798c0c4c92e588d8c217fbf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:38 2019 +0100 msvcrt: Move more printf tests to table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d62f09cc0f..bfdab8cc6b 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -242,6 +242,8 @@ static void test_sprintf( void ) { "%C", "a", 0, INT_ARG, 'a' }, { "%C", "", 0, INT_ARG, 0x3042 }, { "a%Cb", "ab", 0, INT_ARG, 0x3042 }, + { "%lld", "-8589934591", "1", ULONGLONG_ARG, 0, ((ULONGLONG)0xffffffff)*0xffffffff }, + { "%I32d", "1", "I32d", INT_ARG, 1 } }; char buffer[100]; @@ -278,19 +280,6 @@ static void test_sprintf( void ) } } - r = p_sprintf(buffer, "%lld", ((ULONGLONG)0xffffffff)*0xffffffff); - ok( r == 1 || r == 11, "return count wrong %d\n", r); - if (r == 11) /* %ll works on Vista */ - ok(!strcmp(buffer, "-8589934591"), "Problem with \"ll\" interpretation '%s'\n", buffer); - else - ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation '%s'\n", buffer); - - r = p_sprintf(buffer, "%I32d", 1); - if (r == 1) - ok(!strcmp(buffer,"1"),"I32d failed, got '%s'\n",buffer); - else - ok(r == 4 && !strcmp(buffer,"I32d"),"I32d failed, got '%s',%d\n",buffer,r); - if (sizeof(void *) == 8) { r = p_sprintf(buffer, "%p", (void *)57); @@ -316,6 +305,10 @@ static void test_sprintf( void ) r = p_sprintf(buffer, "%Ix %d", (size_t)0x12345678123456,1); ok(!strcmp(buffer,"12345678123456 1"),"buffer = %s\n",buffer); ok( r==16, "return count wrong\n"); + + r = p_sprintf(buffer, "%p", 0); + ok(!strcmp(buffer,"0000000000000000"), "failed\n"); + ok( r==16, "return count wrong\n"); } else { @@ -342,6 +335,10 @@ static void test_sprintf( void ) r = p_sprintf(buffer, "%Ix %d", 0x123456, 1); ok(!strcmp(buffer,"123456 1"),"buffer = %s\n",buffer); ok( r==8, "return count wrong\n"); + + r = p_sprintf(buffer, "%p", 0); + ok(!strcmp(buffer,"00000000"), "failed\n"); + ok( r==8, "return count wrong\n"); } r = p_sprintf(buffer, "%.*s", 1, "foo"); @@ -367,18 +364,6 @@ static void test_sprintf( void ) ok( r==4, "return count wrong: %d\n", r); } - r = p_sprintf(buffer, "%p", 0); - if (sizeof(void *) == 8) - { - ok(!strcmp(buffer,"0000000000000000"), "failed\n"); - ok( r==16, "return count wrong\n"); - } - else - { - ok(!strcmp(buffer,"00000000"), "failed\n"); - ok( r==8, "return count wrong\n"); - } - r = p_sprintf(buffer, "%S", L"\x3042"); ok(r==-1 || broken(!r), "r = %d\n", r);

1 0

Piotr Caban : msvcrt: Fix test failures on Windows 10.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: c2b6dcb08f63b18e62017122057ede7144bcdf74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b6dcb08f63b18e62017122… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:34 2019 +0100 msvcrt: Fix test failures on Windows 10. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 286 ++++++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2b6dcb08f63b18e6201…

1 0

Piotr Caban : msvcrt: Simplify printf tests table.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 465f3cf37a9b13842798b9478c381e7de4ed2aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=465f3cf37a9b13842798b947… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:27 2019 +0100 msvcrt: Simplify printf tests table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 253 ++++++++++++++++++++++----------------------- 1 file changed, 126 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=465f3cf37a9b13842798…

1 0

Louis Lenders : httpapi: Add stub for HttpReceiveRequestEntityBody.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: ab77c7bb06a28d9bf419abf1c6604b848290b91e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab77c7bb06a28d9bf419abf1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Oct 31 13:37:42 2019 +0100 httpapi: Add stub for HttpReceiveRequestEntityBody. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48017 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 14 ++++++++++++++ include/http.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index e2f165c688..c27d0c96b0 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -39,7 +39,7 @@ @ stub HttpReceiveClientCertificate @ stdcall HttpReceiveHttpRequest(ptr int64 long ptr long ptr ptr) @ stub HttpReceiveHttpResponse -@ stub HttpReceiveRequestEntityBody +@ stdcall HttpReceiveRequestEntityBody(ptr int64 long ptr long ptr ptr) @ stub HttpRemoveAllUrlsFromConfigGroup @ stdcall HttpRemoveUrl(ptr wstr) @ stub HttpRemoveUrlFromConfigGroup diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 03511d6c9f..47b5d8a2bb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -278,6 +278,20 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) return remove_url(queue, url); } +/*********************************************************************** + * HttpReceiveRequestEntityBody (HTTPAPI.@) + */ +ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, + void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) +{ + *ret_size = 0; + + FIXME("stub: queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); + + return ERROR_HANDLE_EOF; +} + /*********************************************************************** * HttpReceiveHttpRequest (HTTPAPI.@) */ diff --git a/include/http.h b/include/http.h index 7586d0cbe0..49eb557fae 100644 --- a/include/http.h +++ b/include/http.h @@ -441,6 +441,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved ULONG WINAPI HttpTerminate(ULONG flags, void *reserved); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); +ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, void *buffer, ULONG size, ULONG *ret_size, OVERLAPPED *ovl); ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data);

1 0

Alistair Leslie-Hughes : ntdll: Fix compile error on macos.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 4a1bbff61b2199d6234b1100c0b2f190e6f7ffe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a1bbff61b2199d6234b1100… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 1 07:13:59 2019 +0000 ntdll: Fix compile error on macos. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 81bac70b0f..b6daa226b3 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3196,7 +3196,7 @@ static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) #else -static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *) +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) { FIXME("SystemBatteryState not implemented on this platform\n"); return STATUS_NOT_IMPLEMENTED;

1 0

Zebediah Figura : qedit/mediadet: Check for failure from IEnumPins::Next().
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 9defa529fcc98dad5387a0a6c2a7ea40a8966808 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9defa529fcc98dad5387a0a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 31 23:33:32 2019 -0500 qedit/mediadet: Check for failure from IEnumPins::Next(). Fixes a test crash when gstreamer is not present. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index b7a5abb80c..1d70a86a5a 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -456,7 +456,12 @@ static HRESULT GetSplitter(MediaDetImpl *This) IPin_Release(source_pin); goto retry; } - IEnumPins_Next(pins, 1, &splitter_pin, NULL); + if (IEnumPins_Next(pins, 1, &splitter_pin, NULL) != S_OK) + { + IEnumPins_Release(pins); + IPin_Release(source_pin); + goto retry; + } IEnumPins_Release(pins); hr = IPin_Connect(source_pin, splitter_pin, NULL);

1 0

Daniel Lehman : wine.inf: Add Dynamic DST for US time zones.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: b796b9fba8fcc93921cb135889064bea34064fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b796b9fba8fcc93921cb1358… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 31 19:52:09 2019 -0700 wine.inf: Add Dynamic DST for US time zones. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0ae057dc4c..df74f28e66 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2808,6 +2808,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Std",,"@tzres.dll,-50192" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Std",,"Alaskan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"TZI",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2006",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2007",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Display",,"Asia/Riyadh" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Dlt",,"Arab Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Dlt",,"@tzres.dll,-41969" @@ -2953,6 +2957,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Std",,"@tzres.dll,-17456" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Std",,"Central Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"America/Mexico_City" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-32801" @@ -3004,6 +3012,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30800" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Display",,"Africa/Cairo" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Dlt",,"Egypt Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Dlt",,"@tzres.dll,-59425" @@ -3299,6 +3311,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Std",,"@tzres.dll,-34352" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2006",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2007",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Display",,"America/Chihuahua" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Dlt",,"Mountain Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-7249" @@ -3368,6 +3384,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Std",,"@tzres.dll,-11232" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-15585"

1 0

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 November 2019