May 2019 - Wine-Commits - list.winehq.org

Michael Stefaniuc : rpcrt4: Use CONTAINING_RECORD instead of an extra macro.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: fb4a77d5c68120fe743ed2c750d714e124e3e775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb4a77d5c68120fe743ed2c7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 7 20:16:21 2019 +0200 rpcrt4: Use CONTAINING_RECORD instead of an extra macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index dbf4074..70e7879 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -132,8 +132,6 @@ static inline void align_pointer_offset_clear( unsigned char **ptr, unsigned cha #define NDR_TABLE_SIZE 128 #define NDR_TABLE_MASK 127 -#define NDRSContextFromValue(user_context) (NDR_SCONTEXT)((char *)(user_context) - (char *)NDRSContextValue((NDR_SCONTEXT)NULL)) - static unsigned char *WINAPI NdrBaseTypeMarshall(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); static unsigned char *WINAPI NdrBaseTypeUnmarshall(PMIDL_STUB_MESSAGE, unsigned char **, PFORMAT_STRING, unsigned char); static void WINAPI NdrBaseTypeBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); @@ -7002,7 +7000,7 @@ static unsigned char *WINAPI NdrContextHandleMarshall( } else { - NDR_SCONTEXT ctxt = NDRSContextFromValue(pMemory); + NDR_SCONTEXT ctxt = CONTAINING_RECORD(pMemory, struct _NDR_SCONTEXT, userContext); NDR_RUNDOWN rundown = pStubMsg->StubDesc->apfnNdrRundownRoutines[pFormat[2]]; NdrServerContextNewMarshall(pStubMsg, ctxt, rundown, pFormat); }

1 0

Alexandre Julliard : kernel32: Reset stdio file descriptors when passed invalid handles.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 171dab0696bcb390e8bd4cd00d8b4160134f2e93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=171dab0696bcb390e8bd4cd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 15:03:29 2019 -0500 kernel32: Reset stdio file descriptors when passed invalid handles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 09ab077..200ea8b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2029,6 +2029,27 @@ static BOOL terminate_main_thread(void) } #endif + +/*********************************************************************** + * set_stdio_fd + */ +static void set_stdio_fd( int stdin_fd, int stdout_fd ) +{ + int fd = -1; + + if (stdin_fd == -1 || stdout_fd == -1) + { + fd = open( "/dev/null", O_RDWR ); + if (stdin_fd == -1) stdin_fd = fd; + if (stdout_fd == -1) stdout_fd = fd; + } + + dup2( stdin_fd, 0 ); + dup2( stdout_fd, 1 ); + if (fd != -1) close( fd ); +} + + /*********************************************************************** * spawn_loader */ @@ -2060,21 +2081,10 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int socket if (params->ConsoleFlags || params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC || (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { - int fd = open( "/dev/null", O_RDWR ); setsid(); - /* close stdin and stdout */ - if (fd != -1) - { - dup2( fd, 0 ); - dup2( fd, 1 ); - close( fd ); - } - } - else - { - if (stdin_fd != -1) dup2( stdin_fd, 0 ); - if (stdout_fd != -1) dup2( stdout_fd, 1 ); + set_stdio_fd( -1, -1 ); /* close stdin and stdout */ } + else set_stdio_fd( stdin_fd, stdout_fd ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd );

1 0

Alexandre Julliard : msi: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 280d10b27715c86a5784bba8db7db1e52b1602fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=280d10b27715c86a5784bba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:31:38 2019 -0500 msi: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 2 +- dlls/msi/tokenize.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 153ff21..386c2c4 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3471,7 +3471,7 @@ static UINT msi_dialog_hyperlink_handler( msi_dialog *dialog, msi_control *contr while (*p && isspaceW( *p )) p++; len = strlenW( p ); - if (len > len_href && !memicmpW( p, hrefW, len_href )) + if (len > len_href && !strncmpiW( p, hrefW, len_href )) { p += len_href; while (*p && isspaceW( *p )) p++; diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index d1c2da9..e429495 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -128,7 +128,7 @@ static int compKeyword(const void *m1, const void *m2){ const Keyword *k1 = m1, *k2 = m2; int ret, len = min( k1->len, k2->len ); - if ((ret = memicmpW( k1->name, k2->name, len ))) return ret; + if ((ret = strncmpiW( k1->name, k2->name, len ))) return ret; if (k1->len < k2->len) return -1; else if (k1->len > k2->len) return 1; return 0;

1 0

Alexandre Julliard : mshtml: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: d7ef6cbbf9b4f7cf9acd2714903584d5b89914ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ef6cbbf9b4f7cf9acd2714… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:31:31 2019 -0500 mshtml: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6fe3fc8..4ece2d3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -728,7 +728,7 @@ static void parse_content_type(nsChannelBSC *This, const WCHAR *value) ptr++; len = strlenW(value); - if(ptr + ARRAY_SIZE(charsetW) < value+len && !memicmpW(ptr, charsetW, ARRAY_SIZE(charsetW))) { + if(ptr + ARRAY_SIZE(charsetW) < value+len && !strncmpiW(ptr, charsetW, ARRAY_SIZE(charsetW))) { size_t charset_len, lena; nsACString charset_str; const WCHAR *charset;

1 0

Alexandre Julliard : mountmgr.sys: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 38b1a1afcaa69b3eb389b6209080f69f2a27a43c URL: https://source.winehq.org/git/wine.git/?a=commit;h=38b1a1afcaa69b3eb389b620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:31:21 2019 -0500 mountmgr.sys: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index b792be4..2f43a22 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -132,14 +132,14 @@ static BOOL matching_mount_point( const struct mount_point *mount, const MOUNTMG { const WCHAR *name = (const WCHAR *)((const char *)spec + spec->SymbolicLinkNameOffset); if (spec->SymbolicLinkNameLength != mount->link.Length) return FALSE; - if (memicmpW( name, mount->link.Buffer, mount->link.Length/sizeof(WCHAR))) + if (strncmpiW( name, mount->link.Buffer, mount->link.Length/sizeof(WCHAR))) return FALSE; } if (spec->DeviceNameOffset) { const WCHAR *name = (const WCHAR *)((const char *)spec + spec->DeviceNameOffset); if (spec->DeviceNameLength != mount->name.Length) return FALSE; - if (memicmpW( name, mount->name.Buffer, mount->name.Length/sizeof(WCHAR))) + if (strncmpiW( name, mount->name.Buffer, mount->name.Length/sizeof(WCHAR))) return FALSE; } if (spec->UniqueIdOffset)

1 0

Jactry Zeng : d3dcompiler: Implement D3DReadFileToBlob().
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 622422e67bfd9da487102aee4ca42681a24a8e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=622422e67bfd9da487102aee… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue May 7 22:42:24 2019 +0200 d3dcompiler: Implement D3DReadFileToBlob(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/blob.c | 50 ++++++++++- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/tests/blob.c | 132 ++++++++++++++++++++++++++++-- 3 files changed, 175 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index f22dc71..6c925af 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -466,9 +466,55 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) { - FIXME("filename %s, contents %p\n", debugstr_w(filename), contents); + struct d3dcompiler_blob *object; + SIZE_T data_size; + DWORD read_size; + HANDLE file; + HRESULT hr; - return E_NOTIMPL; + TRACE("filename %s, contents %p.\n", debugstr_w(filename), contents); + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + data_size = GetFileSize(file, NULL); + if (data_size == INVALID_FILE_SIZE) + { + CloseHandle(file); + return HRESULT_FROM_WIN32(GetLastError()); + } + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + CloseHandle(file); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = d3dcompiler_blob_init(object, data_size))) + { + WARN("Failed to initialize blob, hr %#x.\n", hr); + CloseHandle(file); + heap_free(object); + return hr; + } + + if (!ReadFile(file, object->data, data_size, &read_size, NULL) || (read_size != data_size)) + { + WARN("Failed to read file contents.\n"); + CloseHandle(file); + heap_free(object->data); + heap_free(object); + return E_FAIL; + } + CloseHandle(file); + object->size = read_size; + + *contents = &object->ID3DBlob_iface; + + TRACE("Returning ID3DBlob %p.\n", *contents); + + return S_OK; } HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob* blob, const WCHAR *filename, BOOL overwrite) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 68ff962..dabe0da 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -25,6 +25,7 @@ #include "wine/debug.h" #include "wine/list.h" #include "wine/rbtree.h" +#include "wine/heap.h" #define COBJMACROS #include "windef.h" diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 443ed27..3e1a3aa 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -35,6 +35,7 @@ static HRESULT (WINAPI *pD3DCreateBlob)(SIZE_T, ID3DBlob **); static HRESULT (WINAPI *pD3DGetBlobPart)(const void *, SIZE_T, D3D_BLOB_PART, UINT, ID3DBlob **); +static HRESULT (WINAPI *pD3DReadFileToBlob)(const WCHAR *, ID3DBlob **); static HRESULT (WINAPI *pD3DStripShader)(const void *, SIZE_T, UINT, ID3DBlob **); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ @@ -740,7 +741,7 @@ static void test_get_blob_part2(void) ok(!refcount, "ID3DBlob has %u references left\n", refcount); } -static BOOL load_d3dcompiler(void) +static BOOL load_d3dcompiler_43(void) { HMODULE module; @@ -752,15 +753,134 @@ static BOOL load_d3dcompiler(void) return TRUE; } +static BOOL load_d3dcompiler_47(void) +{ + HMODULE module; + + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) + return FALSE; + + pD3DReadFileToBlob = (void *)GetProcAddress(module, "D3DReadFileToBlob"); + return TRUE; +} + +static BOOL create_file(WCHAR *filename, const DWORD *data, DWORD data_size) +{ + static WCHAR temp_dir[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + GetTempFileNameW(temp_dir, NULL, 0, filename); + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (data) + { + WriteFile(file, data, data_size, &written, NULL); + if (written != data_size) + { + CloseHandle(file); + DeleteFileW(filename); + return FALSE; + } + } + CloseHandle(file); + return TRUE; +} + +/* test_cso_data - fxc.exe file.hlsl /Fo file.cso */ +static const DWORD test_cso_data[] = +{ +#if 0 + struct PSInput + { + float4 value : SV_POSITION; + }; + + PSInput main(float4 position : POSITION) + { + PSInput result; + result.value = position; + return result; + } +#endif + 0xfffe0200, 0x0014fffe, 0x42415443, 0x0000001c, 0x00000023, 0xfffe0200, 0x00000000, 0x00000000, + 0x00000100, 0x0000001c, 0x325f7376, 0x4d00305f, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, + 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x0200001f, 0x80000000, + 0x900f0000, 0x02000001, 0xc00f0000, 0x90e40000, 0x0000ffff +}; + +static void test_D3DReadFileToBlob(void) +{ + WCHAR filename[MAX_PATH] = {'n','o','n','e','x','i','s','t','e','n','t',0}; + ID3DBlob *blob = NULL; + SIZE_T data_size; + DWORD *data; + HRESULT hr; + + hr = pD3DReadFileToBlob(filename, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + + hr = pD3DReadFileToBlob(filename, &blob); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + + if (0) + { + /* Crashes on Windows. */ + create_file(filename, test_cso_data, ARRAY_SIZE(test_cso_data)); + pD3DReadFileToBlob(filename, NULL); + DeleteFileW(filename); + } + + if (!create_file(filename, NULL, 0)) + { + win_skip("File creation failed.\n"); + return; + } + hr = pD3DReadFileToBlob(filename, &blob); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Blob_GetBufferSize(blob); + ok(!data_size, "Got unexpected data size.\n"); + DeleteFileW(filename); + ID3D10Blob_Release(blob); + + if (!create_file(filename, test_cso_data, ARRAY_SIZE(test_cso_data))) + { + win_skip("File creation failed.\n"); + return; + } + hr = pD3DReadFileToBlob(filename, &blob); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Blob_GetBufferSize(blob); + ok(data_size == ARRAY_SIZE(test_cso_data), "Got unexpected data size.\n"); + data = ID3D10Blob_GetBufferPointer(blob); + ok(!memcmp(data, test_cso_data, ARRAY_SIZE(test_cso_data)), "Got unexpected data.\n"); + DeleteFileW(filename); + ID3D10Blob_Release(blob); +} + START_TEST(blob) { - if (!load_d3dcompiler()) + if (load_d3dcompiler_43()) + { + test_create_blob(); + test_get_blob_part(); + test_get_blob_part2(); + } + else { win_skip("Could not load d3dcompiler_43.dll\n"); - return; } - test_create_blob(); - test_get_blob_part(); - test_get_blob_part2(); + if (load_d3dcompiler_47()) + { + test_D3DReadFileToBlob(); + } + else + { + win_skip("Could not load d3dcompiler_47.dll.\n"); + } }

1 0

Jacek Caban : ntoskrnl.exe/tests: Add more overlapped tests.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 4e4a1098f27e09d0c450e8425b158ad416133be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e4a1098f27e09d0c450e842… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 7 16:15:33 2019 +0200 ntoskrnl.exe/tests: Add more overlapped tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 45 +++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 33027d9..d47943a 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -35,6 +35,7 @@ static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); +static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static void load_resource(const char *name, char *filename) { @@ -198,17 +199,19 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, teststr), "got '%s'\n", buf); } -static void test_cancel_io(void) +static void test_overlapped(void) { - OVERLAPPED overlapped, overlapped2; - DWORD cancel_cnt; - HANDLE file; + OVERLAPPED overlapped, overlapped2, *o; + DWORD cancel_cnt, size; + HANDLE file, port; + ULONG_PTR key; BOOL res; overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); overlapped2.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - file = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + file = CreateFileA("\\\\.\\WineTestDriver", FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, + 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); ok(file != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); /* test cancelling all device requests */ @@ -275,6 +278,34 @@ static void test_cancel_io(void) ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); } + port = CreateIoCompletionPort(file, NULL, 0xdeadbeef, 0); + ok(port != NULL, "CreateIoCompletionPort failed, error %u\n", GetLastError()); + res = GetQueuedCompletionStatus(port, &size, &key, &o, 0); + ok(!res && GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus returned %x(%u)\n", res, GetLastError()); + + res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + res = GetQueuedCompletionStatus(port, &size, &key, &o, 0); + ok(res, "GetQueuedCompletionStatus failed: %u\n", GetLastError()); + ok(o == &overlapped, "o != overlapped\n"); + + if (pSetFileCompletionNotificationModes) + { + res = pSetFileCompletionNotificationModes(file, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(res, "SetFileCompletionNotificationModes failed: %u\n", GetLastError()); + + res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + res = GetQueuedCompletionStatus(port, &size, &key, &o, 0); + todo_wine + ok(!res && GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus returned %x(%u)\n", res, GetLastError()); + } + + CloseHandle(port); CloseHandle(overlapped.hEvent); CloseHandle(overlapped2.hEvent); CloseHandle(file); @@ -337,6 +368,8 @@ START_TEST(ntoskrnl) pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pCancelIoEx = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "CancelIoEx"); + pSetFileCompletionNotificationModes = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), + "SetFileCompletionNotificationModes"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; @@ -352,7 +385,7 @@ START_TEST(ntoskrnl) test_basic_ioctl(); main_test(); - test_cancel_io(); + test_overlapped(); test_load_driver(service2); unload_driver(service2);

1 0

Andrew Eikum : winebus.sys: Report SDL controller dpad as hatswitch.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 564e7b4db9b37f6f0d52843b81a04990998e2795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=564e7b4db9b37f6f0d52843b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 7 09:01:43 2019 -0500 winebus.sys: Report SDL controller dpad as hatswitch. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 59 +++++++++++++++++++++++++++++++++++++++------- dlls/xinput1_3/hid.c | 50 ++++++++++++++++++++++++++++++++------- 2 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 21f4aed..8ff8373 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -92,6 +92,7 @@ MAKE_FUNCPTR(SDL_JoystickGetAxis); MAKE_FUNCPTR(SDL_JoystickGetHat); MAKE_FUNCPTR(SDL_IsGameController); MAKE_FUNCPTR(SDL_GameControllerGetAxis); +MAKE_FUNCPTR(SDL_GameControllerGetButton); MAKE_FUNCPTR(SDL_GameControllerName); MAKE_FUNCPTR(SDL_GameControllerOpen); MAKE_FUNCPTR(SDL_GameControllerEventState); @@ -150,21 +151,21 @@ static const BYTE REPORT_AXIS_TAIL[] = { }; #define IDX_ABS_AXIS_COUNT 23 -#define CONTROLLER_NUM_BUTTONS 15 +#define CONTROLLER_NUM_BUTTONS 11 static const BYTE CONTROLLER_BUTTONS[] = { 0x05, 0x09, /* USAGE_PAGE (Button) */ 0x19, 0x01, /* USAGE_MINIMUM (Button 1) */ - 0x29, CONTROLLER_NUM_BUTTONS, /* USAGE_MAXIMUM (Button 15) */ + 0x29, CONTROLLER_NUM_BUTTONS, /* USAGE_MAXIMUM (Button 11) */ 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ - 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (15) */ + 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (11) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ /* padding */ - 0x95, 0x01, /* REPORT_COUNT (1) */ + 0x95, 0x05, /* REPORT_COUNT (5) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x03, /* INPUT (Cnst,Var,Abs) */ }; @@ -199,6 +200,8 @@ static const BYTE CONTROLLER_TRIGGERS [] = { #define CONTROLLER_NUM_AXES 6 +#define CONTROLLER_NUM_HATSWITCHES 1 + static const BYTE HAPTIC_RUMBLE[] = { 0x06, 0x00, 0xff, /* USAGE PAGE (vendor-defined) */ 0x09, 0x01, /* USAGE (1) */ @@ -496,6 +499,33 @@ static BOOL build_report_descriptor(struct platform_private *ext) return TRUE; } +static SHORT compose_dpad_value(SDL_GameController *joystick) +{ + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_UP)) + { + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) + return SDL_HAT_RIGHTUP; + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) + return SDL_HAT_LEFTUP; + return SDL_HAT_UP; + } + + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_DOWN)) + { + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) + return SDL_HAT_RIGHTDOWN; + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) + return SDL_HAT_LEFTDOWN; + return SDL_HAT_DOWN; + } + + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) + return SDL_HAT_RIGHT; + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) + return SDL_HAT_LEFT; + return SDL_HAT_CENTERED; +} + static BOOL build_mapped_report_descriptor(struct platform_private *ext) { BYTE *report_ptr; @@ -505,12 +535,14 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) descript_size += sizeof(CONTROLLER_AXIS); descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += sizeof(CONTROLLER_BUTTONS); + descript_size += sizeof(REPORT_HATSWITCH); descript_size += test_haptic(ext); ext->axis_start = 0; ext->button_start = CONTROLLER_NUM_AXES * sizeof(WORD); + ext->hat_start = ext->button_start + (CONTROLLER_NUM_BUTTONS + 7) / 8; - ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD); + ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD) + CONTROLLER_NUM_HATSWITCHES; TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -533,6 +565,7 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) report_ptr += sizeof(CONTROLLER_TRIGGERS); memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS)); report_ptr += sizeof(CONTROLLER_BUTTONS); + report_ptr = add_hatswitch(report_ptr, 1); report_ptr += build_haptic(ext, report_ptr); memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL)); @@ -549,6 +582,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) set_axis_value(ext, i, pSDL_GameControllerGetAxis(ext->sdl_controller, i)); + set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); + return TRUE; } @@ -778,10 +813,15 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) case SDL_CONTROLLER_BUTTON_START: usage = 8; break; case SDL_CONTROLLER_BUTTON_BACK: usage = 9; break; case SDL_CONTROLLER_BUTTON_GUIDE: usage = 10; break; - case SDL_CONTROLLER_BUTTON_DPAD_UP: usage = 11; break; - case SDL_CONTROLLER_BUTTON_DPAD_DOWN: usage = 12; break; - case SDL_CONTROLLER_BUTTON_DPAD_LEFT: usage = 13; break; - case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: usage = 14; break; + + case SDL_CONTROLLER_BUTTON_DPAD_UP: + case SDL_CONTROLLER_BUTTON_DPAD_DOWN: + case SDL_CONTROLLER_BUTTON_DPAD_LEFT: + case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: + set_hat_value(private, 0, compose_dpad_value(private->sdl_controller)); + process_hid_report(device, private->report_buffer, private->buffer_length); + break; + default: ERR("Unknown Button %i\n",ie->button); } @@ -1040,6 +1080,7 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ LOAD_FUNCPTR(SDL_JoystickGetHat); LOAD_FUNCPTR(SDL_IsGameController); LOAD_FUNCPTR(SDL_GameControllerGetAxis); + LOAD_FUNCPTR(SDL_GameControllerGetButton); LOAD_FUNCPTR(SDL_GameControllerName); LOAD_FUNCPTR(SDL_GameControllerOpen); LOAD_FUNCPTR(SDL_GameControllerEventState); diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 1ccecb1..f0036b1 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -124,8 +124,8 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ button_count = max(button_count, button_caps[i].NotRange.Usage); } HeapFree(GetProcessHeap(), 0, button_caps); - if (button_count < 14) - WARN("Too few buttons, Continue\n"); + if (button_count < 11) + WARN("Too few buttons, continuing anyway\n"); xinput_caps->Gamepad.wButtons = 0xffff; value_caps_count = caps->NumberInputValueCaps; @@ -335,8 +335,8 @@ void HID_update_state(xinput_controller* device) CHAR *report = private->reports[(private->current_report)%2]; CHAR *target_report = private->reports[(private->current_report+1)%2]; - USAGE buttons[15]; - ULONG button_length; + USAGE buttons[11]; + ULONG button_length, hat_value; LONG value; if (!private->enabled) @@ -361,7 +361,7 @@ void HID_update_state(xinput_controller* device) private->current_report = (private->current_report+1)%2; device->state.dwPacketNumber++; - button_length = 15; + button_length = ARRAY_SIZE(buttons); HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->ppd, target_report, private->report_length); device->state.Gamepad.wButtons = 0; @@ -381,10 +381,42 @@ void HID_update_state(xinput_controller* device) case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; - case 12: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; break; - case 13: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; break; - case 14: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; break; - case 15: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; break; + } + } + + if(HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, &hat_value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + { + switch(hat_value){ + /* 8 1 2 + * 7 0 3 + * 6 5 4 */ + case 0: + break; + case 1: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; + break; + case 2: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; + break; + case 3: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; + break; + case 4: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; + break; + case 5: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; + break; + case 6: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; + break; + case 7: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; + break; + case 8: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; + break; } }

1 0

Andrew Eikum : winebus.sys: Order axes before buttons.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: d0c5a5e89f5b086bfdcd0a7e57088afc4bda986d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0c5a5e89f5b086bfdcd0a7e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 7 09:01:00 2019 -0500 winebus.sys: Order axes before buttons. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 71 ++++++++++++++++++++++++++++--------------- dlls/winebus.sys/bus_udev.c | 58 +++++++++++++++++++++++------------ dlls/winebus.sys/controller.h | 16 ---------- 3 files changed, 84 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d0c5a5e89f5b086bfdcd…

1 0

Alexandre Julliard : ntdll: Reset stdio file descriptors when passed invalid handles.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 6466a17a8e167556a71f755c7aa7c264c45ec694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6466a17a8e167556a71f755c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 15:03:58 2019 -0500 ntdll: Reset stdio file descriptors when passed invalid handles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 573a7a7..3ce5aeb 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1034,6 +1034,26 @@ static const char *get_alternate_loader( char **ret_env ) /*********************************************************************** + * set_stdio_fd + */ +static void set_stdio_fd( int stdin_fd, int stdout_fd ) +{ + int fd = -1; + + if (stdin_fd == -1 || stdout_fd == -1) + { + fd = open( "/dev/null", O_RDWR ); + if (stdin_fd == -1) stdin_fd = fd; + if (stdout_fd == -1) stdout_fd = fd; + } + + dup2( stdin_fd, 0 ); + dup2( stdout_fd, 1 ); + if (fd != -1) close( fd ); +} + + +/*********************************************************************** * spawn_loader */ static NTSTATUS spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int socketfd, @@ -1066,21 +1086,10 @@ static NTSTATUS spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int soc params->ConsoleHandle == (HANDLE)1 /* KERNEL32_CONSOLE_ALLOC */ || (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { - int fd = open( "/dev/null", O_RDWR ); setsid(); - /* close stdin and stdout */ - if (fd != -1) - { - dup2( fd, 0 ); - dup2( fd, 1 ); - close( fd ); - } - } - else - { - if (stdin_fd != -1) dup2( stdin_fd, 0 ); - if (stdout_fd != -1) dup2( stdout_fd, 1 ); + set_stdio_fd( -1, -1 ); /* close stdin and stdout */ } + else set_stdio_fd( stdin_fd, stdout_fd ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd );

1 0