October 2019 - Wine-Commits

Brendan Shanks : server: Don't block when reading from named pipes in PIPE_NOWAIT mode.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: abb1ce10870d12ce5752abce81fd50bddf236180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abb1ce10870d12ce5752abce… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 16 14:50:02 2019 +0200 server: Don't block when reading from named pipes in PIPE_NOWAIT mode. Fixes Rockstar Games Launcher hanging for some users. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- server/named_pipe.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 0980c4ef8c..02df7374c8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3910,7 +3910,7 @@ static void test_nowait(void) ol.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); SetLastError(0xdeadbeef); ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol) == FALSE, "ReadFile should fail\n"); - todo_wine ok(GetLastError() == ERROR_NO_DATA, "got %d should be ERROR_NO_DATA\n", GetLastError()); + ok(GetLastError() == ERROR_NO_DATA, "got %d should be ERROR_NO_DATA\n", GetLastError()); if (GetLastError() == ERROR_IO_PENDING) CancelIo(piperead); diff --git a/server/named_pipe.c b/server/named_pipe.c index 8e0380d060..6926712b8c 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -851,6 +851,11 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) switch (pipe_end->state) { case FILE_PIPE_CONNECTED_STATE: + if ((pipe_end->flags & NAMED_PIPE_NONBLOCKING_MODE) && list_empty( &pipe_end->message_queue )) + { + set_error( STATUS_PIPE_EMPTY ); + return 0; + } break; case FILE_PIPE_DISCONNECTED_STATE: set_error( STATUS_PIPE_DISCONNECTED );

1 0

Alexandre Julliard : ntoskrnl: Export some functions on all architecture except i386.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 2d25263a3195567a3ab233226b4f02db35f64395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d25263a3195567a3ab23322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 14:33:54 2019 +0200 ntoskrnl: Export some functions on all architecture except i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index fca06884a0..d47a706054 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1,4 +1,4 @@ -@ stdcall -arch=arm,arm64,x86_64 ExAcquireFastMutex(ptr) +@ stdcall -arch=!i386 ExAcquireFastMutex(ptr) @ stdcall -fastcall ExAcquireFastMutexUnsafe(ptr) @ stub ExAcquireRundownProtection @ stub ExAcquireRundownProtectionEx @@ -9,7 +9,7 @@ @ stdcall -fastcall -arch=i386 ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList @ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection -@ stdcall -arch=arm,arm64,x86_64 ExReleaseFastMutex(ptr) +@ stdcall -arch=!i386 ExReleaseFastMutex(ptr) @ stdcall -fastcall ExReleaseFastMutexUnsafe(ptr) @ stdcall -fastcall ExReleaseResourceLite(ptr) @ stub ExReleaseRundownProtection @@ -33,7 +33,7 @@ @ stdcall -arch=win64 ExpInterlockedPopEntrySList(ptr) RtlInterlockedPopEntrySList @ stdcall -arch=win64 ExpInterlockedPushEntrySList(ptr ptr) RtlInterlockedPushEntrySList @ stub HalExamineMBR -@ stdcall -arch=arm,arm64,x86_64 InitializeSListHead(ptr) RtlInitializeSListHead +@ stdcall -arch=!i386 InitializeSListHead(ptr) RtlInitializeSListHead @ stdcall -fastcall InterlockedCompareExchange(ptr long long) NTOSKRNL_InterlockedCompareExchange @ stdcall -fastcall InterlockedDecrement(ptr) NTOSKRNL_InterlockedDecrement @ stdcall -fastcall InterlockedExchange(ptr long) NTOSKRNL_InterlockedExchange @@ -48,13 +48,13 @@ @ stub IoWritePartitionTable @ stdcall -fastcall IofCallDriver(ptr ptr) @ stdcall -fastcall IofCompleteRequest(ptr long) -@ stdcall -arch=arm,arm64,x86_64 KeAcquireInStackQueuedSpinLock(ptr ptr) +@ stdcall -arch=!i386 KeAcquireInStackQueuedSpinLock(ptr ptr) @ stdcall -fastcall KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) @ stdcall KeEnterGuardedRegion() @ stdcall KeExpandKernelStackAndCallout(ptr ptr long) @ stdcall KeExpandKernelStackAndCalloutEx(ptr ptr long long ptr) @ stdcall KeLeaveGuardedRegion() -@ stdcall -arch=arm,arm64,x86_64 KeReleaseInStackQueuedSpinLock(ptr) +@ stdcall -arch=!i386 KeReleaseInStackQueuedSpinLock(ptr) @ stdcall -fastcall KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel @@ -522,7 +522,7 @@ @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock @ stdcall KeAcquireSpinLockAtDpcLevel(ptr) -@ stdcall -arch=arm,arm64,x86_64 KeAcquireSpinLockRaiseToDpc(ptr) +@ stdcall -arch=!i386 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stdcall KeAreApcsDisabled() @ stub KeAttachProcess @@ -604,7 +604,7 @@ @ stub KeReleaseMutant @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) -@ stdcall -arch=arm,arm64,x86_64 KeReleaseSpinLock(ptr long) +@ stdcall -arch=!i386 KeReleaseSpinLock(ptr long) @ stdcall KeReleaseSpinLockFromDpcLevel(ptr) @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy

1 0

Alistair Leslie-Hughes : wshom.ocx: Correct out parameter for _NewEnum.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 46dcaa5b93f264a75b0c924eb72d86574b6fdd64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46dcaa5b93f264a75b0c924e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 16 10:06:11 2019 +0000 wshom.ocx: Correct out parameter for _NewEnum. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d423856ce7..543d951ea0 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -698,7 +698,7 @@ static HRESULT WINAPI WshCollection_get_length(IWshCollection *iface, LONG *coun return E_NOTIMPL; } -static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown *Enum) +static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown **Enum) { WshCollection *This = impl_from_IWshCollection(iface); FIXME("(%p)->(%p): stub\n", This, Enum); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 039938c82b..00391d5283 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [ diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index d936721589..8d4a8f03e1 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [

1 0

Felix Hädicke : msvcrt: Use memmove() instead of memcpy() puts_clbk_str().
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 90e520b418dcedae6fbfdd56b791ba50652f2ee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90e520b418dcedae6fbfdd56… Author: Felix Hädicke <felixhaedicke(a)web.de> Date: Thu Oct 10 23:39:35 2019 +0200 msvcrt: Use memmove() instead of memcpy() puts_clbk_str(). memcpy() must not be used here, because results are undefined if the memory areas overlap. This can cause problems, particularly if particular compiler optimisations are enabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47918 Signed-off-by: Felix Hädicke <felixhaedicke(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/wcs.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index a0d75401c4..346fb5ac5d 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -52,13 +52,13 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len*sizeof(APICHAR)); + memmove(out->buf, str, out->len*sizeof(APICHAR)); out->buf += out->len; out->len = 0; return -1; } - memcpy(out->buf, str, len*sizeof(APICHAR)); + memmove(out->buf, str, len*sizeof(APICHAR)); out->buf += len; out->len -= len; return len; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f84963ce2e..3e5bb512ff 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -781,13 +781,13 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len); + memmove(out->buf, str, out->len); out->buf += out->len; out->len = 0; return len; } - memcpy(out->buf, str, len); + memmove(out->buf, str, len); out->buf += len; out->len -= len; return len;

1 0

Jacek Caban : server: Reselect read queue before write queue in pipe_end_write.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: add05569917152b45f3288f67f7e7a0ae62d0fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=add05569917152b45f3288f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 16 14:50:18 2019 +0200 server: Reselect read queue before write queue in pipe_end_write. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 6926712b8c..1e0c5898a1 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -787,11 +787,10 @@ static int ignore_reselect; static void reselect_write_queue( struct pipe_end *pipe_end ); -static void reselect_read_queue( struct pipe_end *pipe_end ) +static void reselect_read_queue( struct pipe_end *pipe_end, int reselect_write ) { struct async *async; struct iosb *iosb; - int read_done = 0; ignore_reselect = 1; while (!list_empty( &pipe_end->message_queue ) && (async = find_pending_async( &pipe_end->read_q ))) @@ -801,7 +800,7 @@ static void reselect_read_queue( struct pipe_end *pipe_end ) async_terminate( async, iosb->result ? STATUS_ALERTED : iosb->status ); release_object( async ); release_object( iosb ); - read_done = 1; + reselect_write = 1; } ignore_reselect = 0; @@ -809,7 +808,7 @@ static void reselect_read_queue( struct pipe_end *pipe_end ) { if (list_empty( &pipe_end->message_queue )) fd_async_wake_up( pipe_end->connection->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); - else if (read_done) + else if (reselect_write) reselect_write_queue( pipe_end->connection ); } } @@ -841,7 +840,7 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) } ignore_reselect = 0; - reselect_read_queue( reader ); + reselect_read_queue( reader, 0 ); } static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) @@ -870,7 +869,7 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) } queue_async( &pipe_end->read_q, async ); - reselect_read_queue( pipe_end ); + reselect_read_queue( pipe_end, 0 ); set_error( STATUS_PENDING ); return 1; } @@ -905,7 +904,7 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) message->async = (struct async *)grab_object( async ); queue_async( &pipe_end->write_q, async ); - reselect_write_queue( pipe_end ); + reselect_read_queue( pipe_end->connection, 1 ); set_error( STATUS_PENDING ); return 1; } @@ -919,7 +918,7 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) if (&pipe_end->write_q == queue) reselect_write_queue( pipe_end ); else if (&pipe_end->read_q == queue) - reselect_read_queue( pipe_end ); + reselect_read_queue( pipe_end, 0 ); } static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ) @@ -1019,10 +1018,10 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) message = queue_message( pipe_end->connection, iosb ); release_object( iosb ); if (!message) return 0; - reselect_read_queue( pipe_end->connection ); + reselect_read_queue( pipe_end->connection, 0 ); queue_async( &pipe_end->read_q, async ); - reselect_read_queue( pipe_end ); + reselect_read_queue( pipe_end, 0 ); set_error( STATUS_PENDING ); return 1; }

1 0

Piotr Caban : msvcrt/tests: Add overlapped memory move sprintf test.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 70b3e2b0e8af02232b003e8e57edde1c0a1bf89a URL: https://source.winehq.org/git/wine.git/?a=commit;h=70b3e2b0e8af02232b003e8e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 11:37:30 2019 +0200 msvcrt/tests: Add overlapped memory move sprintf test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 5e15989d1c..6f7ebde512 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -802,6 +802,11 @@ static void test_sprintf( void ) ok(r==2, "r = %d\n", r); ok(!strcmp(buffer, "\x82\xa0"), "failed: \"%s\"\n", buffer); + strcpy(buffer, " string to copy"); + r = p_sprintf(buffer, buffer+1); + ok(r==14, "r = %d\n", r); + ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); + setlocale(LC_ALL, "C"); }

1 0

Francois Gouget : testbot: Increase the job retention time to 30 days.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: tools Branch: master Commit: e4fe313b335a5d7c224b2fc2f5e6d5fd7ae4abd4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e4fe313b335a5d7c224b2fc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 16 14:33:32 2019 +0200 testbot: Increase the job retention time to 30 days. The patches website points to TestBot jobs so it makes sense for the retention times to match. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 56971b7..d59233f 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -146,7 +146,7 @@ $LDAPSearchFilter = undef; $LDAPRealNameAttribute = undef; $LDAPEMailAttribute = undef; -$JobPurgeDays = 7; +$JobPurgeDays = 30; if (!$::BuildEnv) {

1 0

Zebediah Figura : wininet/tests: Handle ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE on newer 11.x versions.
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 1283f3807e21a380e4fb8e84de9787f0a92d3790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1283f3807e21a380e4fb8e84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 15 10:29:47 2019 -0500 wininet/tests: Handle ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE on newer 11.x versions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 7889e40ea8..13b2930988 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1555,14 +1555,11 @@ static void test_InternetErrorDlg(void) /* Handle some special cases */ switch(i) { - case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: - case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: + case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: /* later 9.x versions */ + case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: /* later 9.x versions */ + case ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE: /* later 11.x versions */ if(res == ERROR_CANCELLED) - { - /* Some windows XP, w2k3 x64, W2K8 */ - win_skip("Skipping some tests for %d\n", i); - continue; - } + expected = ERROR_CANCELLED; break; case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: if(res != expected)

1 0

Gijs Vermeulen : scrrun/tests: Fix DriveCollection clone tests when there's only one drive.
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 015c20a7b7afdd698ea451daeb01c5b2155773cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=015c20a7b7afdd698ea451da… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Mon Oct 14 13:50:16 2019 +0200 scrrun/tests: Fix DriveCollection clone tests when there's only one drive. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5f207ed37a..3b4af3c498 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -973,7 +973,7 @@ static void test_GetFolder(void) IFolder_Release(folder); } -static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, int line) +static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, LONG count, int line) { HRESULT hr; IEnumVARIANT *clone; @@ -998,17 +998,25 @@ static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, int line VariantInit(&var2); fetched = -1; hr = IEnumVARIANT_Next(clone, 1, &var2, &fetched); - ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); - ok(fetched == 1, "%d: got %d\n", line, fetched); - if (!position_inherited) - todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + if (position_inherited && count == 1) + { + ok(hr == S_FALSE, "%d: got 0x%08x\n", line, hr); + ok(fetched == 0, "%d: got %d\n", line, fetched); + } else { - fetched = -1; - hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); ok(fetched == 1, "%d: got %d\n", line, fetched); - todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + if (!position_inherited) + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + else + { + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + } } VariantClear(&var2); @@ -1018,7 +1026,7 @@ static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, int line hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); } -#define test_clone(a, b) _test_clone(a, b, __LINE__) +#define test_clone(a, b, c) _test_clone(a, b, c, __LINE__) /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void) @@ -1115,7 +1123,7 @@ static void test_FolderCollection(void) ref2 = GET_REFCOUNT(folders); ok(ref2 == ref, "got %d, %d\n", ref2, ref); - test_clone(enumvar, FALSE); + test_clone(enumvar, FALSE, count); for (i = 0; i < 3; i++) { @@ -1285,7 +1293,7 @@ static void test_FileCollection(void) ref2 = GET_REFCOUNT(files); ok(ref2 == ref, "got %d, %d\n", ref2, ref); - test_clone(enumvar, FALSE); + test_clone(enumvar, FALSE, count); for (i = 0; i < 3; i++) { @@ -1399,7 +1407,7 @@ static void test_DriveCollection(void) hr = IEnumVARIANT_Skip(enumvar, 1); ok(hr == S_FALSE, "got 0x%08x\n", hr); - test_clone(enumvar, TRUE); + test_clone(enumvar, TRUE, count); while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { IDrive *drive = (IDrive*)V_DISPATCH(&var);

1 0

Dmitry Timoshkov : wininet: Fix off by 1 error when parsing time.
by Alexandre Julliard Oct. 15, 2019

Oct. 15, 2019

Module: wine Branch: master Commit: 6a976801b1117d95128b4c098be1d5e60d4eab83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a976801b1117d95128b4c09… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 14 12:44:13 2019 +0800 wininet: Fix off by 1 error when parsing time. This patch makes HTTP_ParseRfc1123Date() work for dates without space before "GMT". Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fc412849eb..cf156a9eb5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4375,8 +4375,7 @@ static BOOL HTTP_ParseTime(SYSTEMTIME *st, LPCWSTR *str) ERR("unexpected second in time format %s\n", debugstr_w(ptr)); return FALSE; } - ptr = nextPtr + 1; - *str = ptr; + *str = nextPtr; st->wSecond = (WORD)num; return TRUE; }

1 0