November 2019 - Wine-commits

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: 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

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

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

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

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

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

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

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

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