December 2017 - Wine-Devel - list.winehq.org

[PATCH v4 2/3] ntdll: Don't return an error when reading past EOF in NtReadFileScatter
by Andrew Eikum Dec. 6, 2017

Dec. 6, 2017

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 34 +++++++++++++++++++++++++++++++++- dlls/ntdll/file.c | 8 +++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4980e02d7d..94feee6372 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1; + LPVOID wbuf = NULL, rbuf1, rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4380,6 +4380,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); @@ -4461,6 +4464,34 @@ static void test_WriteFileGather(void) ResetEvent( evt ); + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); @@ -4481,6 +4512,7 @@ static void test_WriteFileGather(void) VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9df15ffe1d..3d4a94923b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1070,11 +1070,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap status = FILE_GetNtStatus(); break; } - if (!result) - { - status = STATUS_END_OF_FILE; - break; - } + if (!result) break; total += result; length -= result; if ((pos += result) == page_size) @@ -1084,6 +1080,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } + if (total == 0) status = STATUS_END_OF_FILE; + send_completion = cvalue != 0; if (needs_close) close( unix_handle ); -- 2.15.1

1 0

[PATCH v4 1/3] ntdll: Report NtReadFileScatter results asynchronously
by Andrew Eikum Dec. 6, 2017

Dec. 6, 2017

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v4: Return STATUS_PENDING only when we get far enough to actually try to read the file. Also added tests to all patches for GetOverlappedResults with an event. dlls/kernel32/tests/file.c | 104 ++++++++++++++++++++++++++++++++++++++++----- dlls/ntdll/file.c | 29 ++++++------- 2 files changed, 108 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..4980e02d7d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4347,13 +4347,16 @@ static void test_SetFileValidData(void) static void test_WriteFileGather(void) { char temp_path[MAX_PATH], filename[MAX_PATH]; - HANDLE hfile, hiocp1, hiocp2; - DWORD ret, size; + HANDLE hfile, hiocp1, hiocp2, evt; + DWORD ret, size, tx; ULONG_PTR key; FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + LPVOID wbuf = NULL, rbuf1; + BOOL br; + + evt = CreateEventW( NULL, TRUE, FALSE, NULL ); ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4374,18 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + fse[0].Buffer = wbuf; + memset( wbuf, 0x42, si.dwPageSize ); + SetLastError( 0xdeadbeef ); if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4393,95 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ResetEvent( evt ); + + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + + ResetEvent( evt ); + + /* start read at EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + S(U(ovl)).OffsetHigh = 0; + S(U(ovl)).Offset = si.dwPageSize; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF || + GetLastError() == ERROR_IO_PENDING, "ReadFileScatter gave wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_IO_PENDING) + { + SetLastError( 0xdeadbeef ); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( !ret, "GetQueuedCompletionStatus should have returned failure\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + SetLastError( 0xdeadbeef ); + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == FALSE, "GetOverlappedResult should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + } + else + { + SetLastError( 0xdeadbeef ); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 100 ); + ok( !ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus gave wrong error %u\n", GetLastError() ); + ok( povl == NULL, "wrong ovl %p\n", povl ); + } + + ResetEvent( evt ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + + /* file handle must be overlapped */ + hfile = CreateFileA( filename, GENERIC_READ, 0, 0, OPEN_EXISTING, + FILE_FLAG_NO_BUFFERING | FILE_ATTRIBUTE_NORMAL, 0 ); + ok( hfile != INVALID_HANDLE_VALUE, "CreateFile failed err %u\n", GetLastError() ); + + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should fail\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "ReadFileScatter failed err %u\n", GetLastError() ); + + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); + CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..9df15ffe1d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1086,25 +1086,24 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap send_completion = cvalue != 0; - error: if (needs_close) close( unix_handle ); - if (status == STATUS_SUCCESS) - { - io_status->u.Status = status; - io_status->Information = total; - TRACE("= SUCCESS (%u)\n", total); - if (event) NtSetEvent( event, NULL ); - if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, - (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); - } - else - { - TRACE("= 0x%08x\n", status); - if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); - } + io_status->u.Status = status; + io_status->Information = total; + TRACE("= 0x%08x (%u)\n", status, total); + if (event) NtSetEvent( event, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); + return STATUS_PENDING; + +error: + if (needs_close) close( unix_handle ); + + TRACE("= 0x%08x\n", status); + if (event) NtResetEvent( event, NULL ); + return status; } -- 2.15.1

1 0

[PATCH] MAINTAINERS: Move WineHQ URLs to https
by Austin English Dec. 6, 2017

Dec. 6, 2017

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2f92151d78..6845a7abb8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3,7 +3,7 @@ List of Wine subsection maintainers When submitting patches to Wine, the guidelines at -<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +<https://wiki.winehq.org/SubmittingPatches> should be followed. This file contains a list of maintainers for subsections of Wine. When submitting patches, you may want to CC relevant people from this list. If you have questions about your work in an area of Wine, you may find a list of @@ -317,7 +317,7 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> -W: http://wiki.winehq.org/StableRules +W: https://wiki.winehq.org/StableRules Staging Branch M: Sebastian Lackner <sebastian(a)fds-team.de> -- 2.13.6

1 0

[PATCH] msvcp: Disable relay for _Thrd_current function
by Piotr Caban Dec. 6, 2017

Dec. 6, 2017

Spotted by Stefan. The patch workarounds a crash when relay is enabled in x86_64 and arm case. Another way of fixing it is to define separate spec file entries for different platforms (make_specfiles will also need to be changed in that case). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] mshtml.idl: Added IDOMKeyboardEvent declaration.
by Jacek Caban Dec. 6, 2017

Dec. 6, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 16 +++++++++++++ include/mshtml.idl | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+)

1 0

[PATCH] msvcp: Fix failure class layout and exception information data
by Piotr Caban Dec. 6, 2017

Dec. 6, 2017

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/cxx.h | 46 ++++++++++++++------ dlls/msvcp90/exception.c | 107 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 130 insertions(+), 23 deletions(-)

1 0

[PATCH 01/10] wined3d: Add support for WINED3DFMT_BC4_SNORM format.
by Józef Kucia Dec. 6, 2017

Dec. 6, 2017

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f73968546fbf..cd0a8e15c908 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -268,6 +268,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, + {WINED3DFMT_BC4_SNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC5_SNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC6H_UF16, WINED3DFMT_BC6H_TYPELESS, ""}, @@ -361,6 +362,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, + {WINED3DFMT_BC4_SNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE}, @@ -1179,6 +1181,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC4_SNORM, GL_COMPRESSED_SIGNED_RED_RGTC1, GL_COMPRESSED_SIGNED_RED_RGTC1, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -3434,6 +3441,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC4_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC4_SNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_SNORM); -- 2.13.6

4 22

[PATCH] wined3d: Add Intel HD Graphics 5000 to the GPU list.
by Li Keqing Dec. 6, 2017

Dec. 6, 2017

Signed-off-by: Li Keqing <auroracloud4096(a)gmail.com> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0bf986044..183a37f79e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1487,6 +1487,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5000, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, @@ -2155,6 +2156,7 @@ cards_intel[] = /* Haswell */ {"Iris Pro 5200", CARD_INTEL_IP5200_1}, {"Iris 5100", CARD_INTEL_I5100_1}, + {"HD Graphics 5000", CARD_INTEL_HD5000}, /* MacOS */ {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da06ba159f..4c43ad8b6c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2435,6 +2435,7 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_HD5000 = 0x0a26, CARD_INTEL_I5100_1 = 0x0a22, CARD_INTEL_I5100_2 = 0x0a2a, CARD_INTEL_I5100_3 = 0x0a2b, -- 2.14.3 (Apple Git-98)

2 1

[PATCH 1/2] msvcp: Use int64 for byval _Thrd_t parameters.
by Stefan Dösinger Dec. 6, 2017

Dec. 6, 2017

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp120/msvcp120.spec | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 8 ++++---- dlls/msvcp140/msvcp140.spec | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 7cf350e0c0..001b9add3e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3858,11 +3858,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_detach(int64) +@ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) -@ cdecl _Thrd_lt(ptr ptr) +@ cdecl _Thrd_join(int64 long) +@ cdecl _Thrd_lt(int64 int64) @ cdecl _Thrd_sleep(ptr) @ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 5285adafb8..729657c24e 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3805,11 +3805,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_detach(int64) +@ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) -@ cdecl _Thrd_lt(ptr ptr) +@ cdecl _Thrd_join(int64 long) +@ cdecl _Thrd_lt(int64 int64) @ cdecl _Thrd_sleep(ptr) @ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f33a2ec78e..62668d21f1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3805,11 +3805,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current -@ cdecl _Thrd_detach(ptr) msvcp120._Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal +@ cdecl _Thrd_detach(int64) msvcp120._Thrd_detach +@ cdecl _Thrd_equal(int64 int64) msvcp120._Thrd_equal @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join -@ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt +@ cdecl _Thrd_join(int64 long) msvcp120._Thrd_join +@ cdecl _Thrd_lt(int64 int64) msvcp120._Thrd_lt @ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) msvcp120._Thrd_start @ cdecl _Thrd_yield() msvcp120._Thrd_yield diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1f61afb550..5d5518115b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3722,12 +3722,12 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl _Thrd_current() _Thrd_current -@ cdecl _Thrd_detach(ptr) _Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) _Thrd_equal +@ cdecl _Thrd_detach(int64) _Thrd_detach +@ cdecl _Thrd_equal(int64 int64) _Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_hardware_concurrency() _Thrd_hardware_concurrency @ cdecl _Thrd_id() _Thrd_id -@ cdecl _Thrd_join(ptr long) _Thrd_join +@ cdecl _Thrd_join(int64 long) _Thrd_join @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) _Thrd_start @ cdecl _Thrd_yield() _Thrd_yield -- 2.13.6

2 3

[PATCH] winegstreamer: Remove redundant check
by Alistair Leslie-Hughes Dec. 6, 2017

Dec. 6, 2017

ret is already checked above and never assigned again. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winegstreamer/gstdemux.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3ef2324..95a1630 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1158,10 +1158,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI WaitForSingleObject(This->event, -1); gst_element_get_state(This->container, NULL, NULL, -1); - if (ret < 0) { - WARN("Ret: %i\n", ret); - hr = E_FAIL; - } else if (!This->cStreams) { + if (!This->cStreams) { FIXME("GStreamer could not find any streams\n"); hr = E_FAIL; } else { -- 1.9.1

2 1