wine-devel April 2019

wine-devel@winehq.org

82 participants
743 discussions

[PATCH] kernel32: Consider the working directory first when launching executables with CreateProcess.
by Vijay Kiran Kamuju 26 Apr '19

26 Apr '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23934 From: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/process.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 09f0433deb0..39e47390558 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -439,9 +439,17 @@ static HANDLE open_exe_file( const WCHAR *name, BOOL *is_64bit ) */ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE *handle ) { + WCHAR cur_dir[MAX_PATH]; + TRACE("looking for %s\n", debugstr_w(name) ); - if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL ) && + /* The working directory takes precedence over other locations for CreateProcess unless the + * 'NoDefaultCurrentDirectoryInExePath' environment variable is set (and the executable name + * does not contain a backslash). */ + if ((NeedCurrentDirectoryForExePathW( name ) && GetCurrentDirectoryW( MAX_PATH, cur_dir) && + !SearchPathW( cur_dir, name, exeW, buflen, buffer, NULL )) && + /* not found in the working directory, try the system search path */ + !SearchPathW( NULL, name, exeW, buflen, buffer, NULL ) && /* no builtin found, try native without extension in case it is a Unix app */ !SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE; -- 2.17.0

3 5

[PATCH resend] user32: Added GetPointerType stub
by Vijay Kiran Kamuju 26 Apr '19

26 Apr '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Add more tests for failures. From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45765 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- ...ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +- dlls/user32/misc.c | 16 ++++++++++ dlls/user32/tests/input.c | 32 +++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec index 93ecc1b3e41..c58d51a47e2 100644 --- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -17,7 +17,7 @@ @ stub GetPointerPenInfoHistory @ stub GetPointerTouchInfo @ stub GetPointerTouchInfoHistory -@ stub GetPointerType +@ stdcall GetPointerType(long ptr) user32.GetPointerType @ stub GetRawPointerDeviceData @ stub InitializeTouchInjection @ stub InjectTouchInput diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d28cd9fd055..1a03d70ddec 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -664,6 +664,22 @@ BOOL WINAPI RegisterTouchHitTestingWindow(HWND hwnd, ULONG value) return TRUE; } +/********************************************************************** + * GetPointerType [USER32.@] + */ +BOOL WINAPI GetPointerType(UINT32 id, POINTER_INPUT_TYPE *type) +{ + FIXME("(%d %p): stub\n", id, type); + + if(!id || !type) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *type = PT_MOUSE; + return TRUE; +} static const WCHAR imeW[] = {'I','M','E',0}; const struct builtin_class_descr IME_builtin_class = diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 625de3d7688..a37c6a01b79 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -78,6 +78,7 @@ static struct { static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); +static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); @@ -165,6 +166,7 @@ static void init_function_pointers(void) GET_PROC(SendInput); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); + GET_PROC(GetPointerType); GET_PROC(GetRawInputDeviceList); GET_PROC(GetRawInputDeviceInfoW); GET_PROC(GetRawInputDeviceInfoA); @@ -2800,6 +2802,31 @@ static void test_input_message_source(void) UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) ); } +static void test_GetPointerType(void) +{ + BOOL ret; + POINTER_INPUT_TYPE type = -1; + UINT id = 0; + + SetLastError(0xdeadbeef); + ret = pGetPointerType(id, NULL); + ok(!ret, "GetPointerType should have failed.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected error ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetPointerType(id, &type); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected error ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + ok(!ret, "GetPointerType failed, got type %d for %u.\n", type, id ); + ok(type == -1, " type %d\n", type ); + + id = 1; + ret = pGetPointerType(id, &type); + ok(ret, "GetPointerType failed, got type %d for %u.\n", type, id ); + ok(type == PT_MOUSE, " type %d\n", type ); +} + START_TEST(input) { POINT pos; @@ -2845,4 +2872,9 @@ START_TEST(input) win_skip("GetCurrentInputMessageSource is not available\n"); SetCursorPos( pos.x, pos.y ); + + if(pGetPointerType) + test_GetPointerType(); + else + win_skip("GetPointerType is not available\n"); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d5b8597d8e4..f9a4ae26df4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -356,6 +356,7 @@ @ stdcall GetParent(long) @ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPointerDevices(ptr ptr) +@ stdcall GetPointerType(long ptr) @ stdcall GetPriorityClipboardFormat(ptr long) @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr) diff --git a/include/winuser.h b/include/winuser.h index 3cffaa19acd..45015199efc 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3831,6 +3831,7 @@ WINUSERAPI HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL); WINUSERAPI HWND WINAPI GetOpenClipboardWindow(void); WINUSERAPI HWND WINAPI GetParent(HWND); WINUSERAPI BOOL WINAPI GetPhysicalCursorPos(POINT*); +WINUSERAPI BOOL WINAPI GetPointerType(UINT32,POINTER_INPUT_TYPE *); WINUSERAPI INT WINAPI GetPriorityClipboardFormat(UINT*,INT); WINUSERAPI BOOL WINAPI GetProcessDefaultLayout(DWORD*); WINUSERAPI BOOL WINAPI GetProcessDpiAwarenessInternal(HANDLE,DPI_AWARENESS*); -- 2.17.0

1 0

[PATCH] include: Add missing structures for ACE and Tokens in winnt.h
by Vijay Kiran Kamuju 26 Apr '19

26 Apr '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/winnt.h | 143 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index b5393f57e6e..0e011cd06ba 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4345,6 +4345,19 @@ typedef struct _SID_AND_ATTRIBUTES { DWORD Attributes; } SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES; +typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY]; +typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY; + +#define SID_HASH_SIZE 32 + +typedef ULONG_PTR SID_HASH_ENTRY, *PSID_HASH_ENTRY; + +typedef struct _SID_AND_ATTRIBUTES_HASH { + DWORD SidCount; + PSID_AND_ATTRIBUTES SidAttr; + SID_HASH_ENTRY Hash[SID_HASH_SIZE]; +} SID_AND_ATTRIBUTES_HASH, *PSID_AND_ATTRIBUTES_HASH; + /* security entities */ #define SECURITY_NULL_RID __MSABI_LONG(0x00000000) #define SECURITY_WORLD_RID __MSABI_LONG(0x00000000) @@ -4848,10 +4861,43 @@ typedef struct _TOKEN_MANDATORY_LABEL { SID_AND_ATTRIBUTES Label; } TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; +#define TOKEN_MANDATORY_POLICY_OFF 0x0 +#define TOKEN_MANDATORY_POLICY_NO_WRITEUP 0x1 +#define TOKEN_MANDATORY_POLICY_NEW_PROCESS_MIN 0x2 +#define TOKEN_MANDATORY_POLICY_VALID_MASK 0x3 + +typedef struct _TOKEN_MANDATORY_POLICY { + DWORD Policy; +} TOKEN_MANDATORY_POLICY, *PTOKEN_MANDATORY_POLICY; + typedef struct _TOKEN_APPCONTAINER_INFORMATION { PSID TokenAppContainer; } TOKEN_APPCONTAINER_INFORMATION, * PTOKEN_APPCONTAINER_INFORMATION; +#define POLICY_AUDIT_SUBCATEGORY_COUNT 53 + +typedef struct _TOKEN_AUDIT_POLICY { + BYTE PerUserPolicy[((POLICY_AUDIT_SUBCATEGORY_COUNT) >> 1) + 1]; +} TOKEN_AUDIT_POLICY, *PTOKEN_AUDIT_POLICY; + +typedef struct _TOKEN_ACCESS_INFORMATION { + PSID_AND_ATTRIBUTES_HASH SidHash; + PSID_AND_ATTRIBUTES_HASH RestrictedSidHash; + PTOKEN_PRIVILEGES Privileges; + LUID AuthenticationId; + TOKEN_TYPE TokenType; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + TOKEN_MANDATORY_POLICY MandatoryPolicy; + DWORD Flags; +} TOKEN_ACCESS_INFORMATION, *PTOKEN_ACCESS_INFORMATION; + +typedef struct _TOKEN_CONTROL { + LUID TokenId; + LUID AuthenticationId; + LUID ModifiedId; + TOKEN_SOURCE TokenSource; +} TOKEN_CONTROL, *PTOKEN_CONTROL; + /* * ACLs of NT */ @@ -4938,9 +4984,106 @@ typedef struct _SYSTEM_MANDATORY_LABEL_ACE { DWORD SidStart; } SYSTEM_MANDATORY_LABEL_ACE,*PSYSTEM_MANDATORY_LABEL_ACE; +typedef struct _ACCESS_ALLOWED_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_ALLOWED_OBJECT_ACE, *PACCESS_ALLOWED_OBJECT_ACE; + +typedef struct _ACCESS_DENIED_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_DENIED_OBJECT_ACE, *PACCESS_DENIED_OBJECT_ACE; + +typedef struct _SYSTEM_AUDIT_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_AUDIT_OBJECT_ACE, *PSYSTEM_AUDIT_OBJECT_ACE; + +typedef struct _SYSTEM_ALARM_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_ALARM_OBJECT_ACE, *PSYSTEM_ALARM_OBJECT_aCE; + +typedef struct _ACCESS_ALLOWED_CALLBACK_ACE { + ACE_HEADER Header; + DWORD Mask; + DWORD SidStart; +} ACCESS_ALLOWED_CALLBACK_ACE,*PACCESS_ALLOWED_CALLBACK_ACE; + +typedef struct _ACCESS_DENIED_CALLBACK_ACE { + ACE_HEADER Header; + DWORD Mask; + DWORD SidStart; +} ACCESS_DENIED_CALLBACK_ACE,*PACCESS_DENIED_CALLBACK_ACE; + +typedef struct _SYSTEM_AUDIT_CALLBACK_ACE { + ACE_HEADER Header; + DWORD Mask; + DWORD SidStart; +} SYSTEM_AUDIT_CALLBACK_ACE,*PSYSTEM_AUDIT_CALLBACK_ACE; + +typedef struct _SYSTEM_ALARM_CALLBACK_ACE { + ACE_HEADER Header; + DWORD Mask; + DWORD SidStart; +} SYSTEM_ALARM_CALLBACK_ACE,*PSYSTEM_ALARM_CALLBACK_ACE; + +typedef struct _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_ALLOWED_CALLBACK_OBJECT_ACE, *PACCESS_ALLOWED_CALLBACK_OBJECT_ACE; + +typedef struct _ACCESS_DENIED_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_DENIED_CALLBACK_OBJECT_ACE, *PACCESS_DENIED_CALLBACK_OBJECT_ACE; + +typedef struct _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_AUDIT_CALLBACK_OBJECT_ACE, *PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE; + +typedef struct _SYSTEM_ALARM_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_ALARM_CALLBACK_OBJECT_ACE, *PSYSTEM_ALARM_CALLBACK_OBJECT_ACE; + #define SYSTEM_MANDATORY_LABEL_NO_WRITE_UP 0x1 #define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 #define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 +#define SYSTEM_MANDATORY_LABEL_VALID_MASK 0x7 typedef enum tagSID_NAME_USE { SidTypeUser = 1, -- 2.17.0

1 0

[PATCH] mfc42: add static library
by Jefferson Carpenter 26 Apr '19

26 Apr '19

4 8

[PATCH] mfplat: Add partial implementation of ConvertToContiguousBuffer().
by Nikolay Sivov 26 Apr '19

26 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 24 +++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 47 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 524398aeac..27ae44a91c 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -686,9 +686,29 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) { - FIXME("%p, %p.\n", iface, buffer); + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, buffer); + + EnterCriticalSection(&sample->cs); + + if (sample->buffer_count == 0) + hr = E_UNEXPECTED; + else if (sample->buffer_count == 1) + { + *buffer = sample->buffers[0]; + IMFMediaBuffer_AddRef(*buffer); + } + else + { + FIXME("Samples with multiple buffers are not supported.\n"); + hr = E_NOTIMPL; + } + + LeaveCriticalSection(&sample->cs); + + return hr; } static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 571d57a220..541b236731 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1475,6 +1475,53 @@ static void test_sample(void) IMFAttributes_Release(attributes); IMFSample_Release(sample); + + /* ConvertToContiguousBuffer() */ + hr = MFCreateSample(&sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer); + ok(hr == E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMemoryBuffer(16, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer instance.\n"); + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer instance.\n"); + IMFMediaBuffer_Release(buffer2); + + hr = MFCreateMemoryBuffer(16, &buffer2); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer2); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 2, "Unexpected buffer count %u.\n", count); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); +todo_wine + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); +todo_wine + ok(count == 1, "Unexpected buffer count %u.\n", count); + + IMFSample_Release(sample); } struct test_callback -- 2.20.1

1 0

[PATCH resend] virtdisk: Add stub and tests for OpenVirtualDisk
by Vijay Kiran Kamuju 26 Apr '19

26 Apr '19

Based on patch from Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45947 From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/virtdisk/tests/virtdisk.c | 41 ++++++++++++++++++++++++++++ dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 14 ++++++++++ include/virtdisk.h | 49 ++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index d1f699fe45..23d070574a 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -18,11 +18,13 @@ #include <stdarg.h> #include "windef.h" +#include "initguid.h" #include "virtdisk.h" #include "wine/heap.h" #include "wine/test.h" static DWORD (WINAPI *pGetStorageDependencyInformation)(HANDLE,GET_STORAGE_DEPENDENCY_FLAG,ULONG,STORAGE_DEPENDENCY_INFO*,ULONG*); +static DWORD (WINAPI *pOpenVirtualDisk)(PVIRTUAL_STORAGE_TYPE,PCWSTR,VIRTUAL_DISK_ACCESS_MASK,OPEN_VIRTUAL_DISK_FLAG,POPEN_VIRTUAL_DISK_PARAMETERS,PHANDLE); static void test_GetStorageDependencyInformation(void) { @@ -47,6 +49,38 @@ static void test_GetStorageDependencyInformation(void) CloseHandle(handle); } +static void test_OpenVirtualDisk(void) +{ + DWORD ret; + HANDLE handle; + VIRTUAL_STORAGE_TYPE stgtype; + OPEN_VIRTUAL_DISK_PARAMETERS param; + static const WCHAR vdisk[] = {'t','e','s','t','.','v','h','d',0}; + + ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + stgtype.DeviceId = VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN; + stgtype.VendorId = VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN; + ret = pOpenVirtualDisk(&stgtype, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_3; + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 10), got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_2; + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 8), got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_1; + ret = pOpenVirtualDisk(&stgtype, vdisk, 0xffffff, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NONE, &param, &handle); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); +} + START_TEST(virtdisk) { HMODULE module = LoadLibraryA("virtdisk.dll"); @@ -57,8 +91,15 @@ START_TEST(virtdisk) } pGetStorageDependencyInformation = (void *)GetProcAddress( module, "GetStorageDependencyInformation" ); + pOpenVirtualDisk = (void *)GetProcAddress( module, "OpenVirtualDisk" ); + if (pGetStorageDependencyInformation) test_GetStorageDependencyInformation(); else win_skip("GetStorageDependencyInformation is not available\n"); + + if (pOpenVirtualDisk) + test_OpenVirtualDisk(); + else + win_skip("OpenVirtualDisk is not available\n"); } diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index 6bd5f146db..f35b8df524 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -15,7 +15,7 @@ @ stub GetVirtualDiskPhysicalPath @ stub MergeVirtualDisk @ stub MirrorVirtualDisk -@ stub OpenVirtualDisk +@ stdcall OpenVirtualDisk(ptr wstr long long ptr ptr) @ stub ResizeVirtualDisk @ stub SetVirtualDiskInformation @ stub SetVirtualDiskMetadata diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 3e6c5c14dc..2d384cb0ed 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -65,3 +65,17 @@ DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_ return ERROR_SUCCESS; } + +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle) +{ + FIXME("(%p, %s, %d, 0x%x, %p, %p): stub\n", type, wine_dbgstr_w(path), mask, flags, param, handle); + + if (!type || !path || (mask & ~VIRTUAL_DISK_ACCESS_ALL) || (flags & ~(OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS | OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE)) || !param) + return ERROR_INVALID_PARAMETER; + + if (param->Version != OPEN_VIRTUAL_DISK_VERSION_1) + return ERROR_INVALID_PARAMETER; + + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/virtdisk.h b/include/virtdisk.h index b4c07f3b69..0c81ee118e 100644 --- a/include/virtdisk.h +++ b/include/virtdisk.h @@ -27,6 +27,11 @@ extern "C" { #define VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN 0 #define VIRTUAL_STORAGE_TYPE_DEVICE_ISO 1 #define VIRTUAL_STORAGE_TYPE_DEVICE_VHD 2 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHDX 3 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHDSET 4 + +DEFINE_GUID(VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(VIRTUAL_STORAGE_TYPE_VENDOR_MICROSOFT, 0xec984aec, 0xa0f9, 0x47e9, 0x90, 0x1f, 0x71, 0x41, 0x5a, 0x66, 0x34, 0x5b); typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NONE = 0x00, @@ -37,6 +42,26 @@ typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NO_SECURITY_DESCRIPTOR = 0x10 } ATTACH_VIRTUAL_DISK_FLAG; +typedef enum _OPEN_VIRTUAL_DISK_FLAG { + OPEN_VIRTUAL_DISK_FLAG_NONE = 0x00, + OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS = 0x01, + OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE = 0x02, + OPEN_VIRTUAL_DISK_FLAG_BOOT_DRIVE = 0x04, + OPEN_VIRTUAL_DISK_FLAG_CACHED_IO = 0x08, + OPEN_VIRTUAL_DISK_FLAG_CUSTOM_DIFF_CHAIN = 0x10, + OPEN_VIRTUAL_DISK_FLAG_PARENT_CACHED_IO = 0x20, + OPEN_VIRTUAL_DISK_FLAG_VHDSET_FILE_ONLY = 0x40, + OPEN_VIRTUAL_DISK_FLAG_IGNORE_RELATIVE_PARENT_LOCATOR = 0x80, + OPEN_VIRTUAL_DISK_FLAG_NO_WRITE_HARDENING = 0x100 +} OPEN_VIRTUAL_DISK_FLAG; + +typedef enum _OPEN_VIRTUAL_DISK_VERSION { + OPEN_VIRTUAL_DISK_VERSION_UNSCPECIFIED, + OPEN_VIRTUAL_DISK_VERSION_1, + OPEN_VIRTUAL_DISK_VERSION_2, + OPEN_VIRTUAL_DISK_VERSION_3 +} OPEN_VIRTUAL_DISK_VERSION; + typedef enum _ATTACH_VIRTUAL_DISK_VERSION { ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED, ATTACH_VIRTUAL_DISK_VERSION_1 @@ -156,6 +181,27 @@ typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { } DUMMYUNIONNAME; } EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; +typedef struct _OPEN_VIRTUAL_DISK_PARAMETERS +{ + OPEN_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG RWDepth; + } Version1; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + } Version2; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + GUID SnapshotId; + } Version3; + } DUMMYUNIONNAME; +} OPEN_VIRTUAL_DISK_PARAMETERS, *POPEN_VIRTUAL_DISK_PARAMETERS; + typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 { DEPENDENT_DISK_FLAG DependencyTypeFlags; @@ -196,6 +242,9 @@ typedef struct _VIRTUAL_DISK_PROGRESS { DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle); + #ifdef __cplusplus } #endif -- 2.21.0

1 0

[PATCH] dinput: Dont report SysMouse/Keyboard devices as supporting Force Feedback.
by Alistair Leslie-Hughes 26 Apr '19

26 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/keyboard.c | 6 ++++++ dlls/dinput/mouse.c | 6 ++++++ dlls/dinput/tests/joystick.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 642d0c0..42c0759 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -215,6 +215,9 @@ static HRESULT keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVI if (id != 0) return E_FAIL; + if (dwFlags & DIEDFL_FORCEFEEDBACK) + return S_FALSE; + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { @@ -233,6 +236,9 @@ static HRESULT keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVI if (id != 0) return E_FAIL; + if (dwFlags & DIEDFL_FORCEFEEDBACK) + return S_FALSE; + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 141b922..f3ec8e4 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -158,6 +158,9 @@ static HRESULT mousedev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEI if (id != 0) return E_FAIL; + if (dwFlags & DIEDFL_FORCEFEEDBACK) + return S_FALSE; + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_POINTER) || (dwDevType == DI8DEVTYPE_MOUSE)) && (version >= 0x0800))) { @@ -176,6 +179,9 @@ static HRESULT mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEI if (id != 0) return E_FAIL; + if (dwFlags & DIEDFL_FORCEFEEDBACK) + return S_FALSE; + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_POINTER) || (dwDevType == DI8DEVTYPE_MOUSE)) && (version >= 0x0800))) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 69e95d0..631ea57 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -270,6 +270,29 @@ static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static BOOL CALLBACK EnumAllFeedback(const DIDEVICEINSTANCEA *lpddi, void *pvRef) +{ + trace("---- Device Information ----\n" + "Product Name : %s\n" + "Instance Name : %s\n" + "devType : 0x%08x\n" + "GUID Product : %s\n" + "GUID Instance : %s\n" + "HID Page : 0x%04x\n" + "HID Usage : 0x%04x\n", + lpddi->tszProductName, + lpddi->tszInstanceName, + lpddi->dwDevType, + wine_dbgstr_guid(&lpddi->guidProduct), + wine_dbgstr_guid(&lpddi->guidInstance), + lpddi->wUsagePage, + lpddi->wUsage); + + ok(!(IsEqualGUID(&GUID_SysMouse, &lpddi->guidProduct) || IsEqualGUID(&GUID_SysKeyboard, &lpddi->guidProduct)), "Invalid device returned.\n"); + + return DIENUM_CONTINUE; +} + static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) { HRESULT hr; @@ -870,6 +893,24 @@ static void joystick_tests(DWORD version) trace(" Version Not Supported\n"); } +static void test_enum_feedback(void) +{ + HRESULT hr; + IDirectInputA *pDI; + ULONG ref; + HINSTANCE hInstance = GetModuleHandleW(NULL); + + hr = DirectInputCreateA(hInstance, 0x0700, &pDI, NULL); + ok(hr==DI_OK||hr==DIERR_OLDDIRECTINPUTVERSION, "DirectInputCreateA() failed: %08x\n", hr); + if (hr==DI_OK && pDI!=0) { + hr = IDirectInput_EnumDevices(pDI, 0, EnumAllFeedback, NULL, DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK); + ok(hr==DI_OK,"IDirectInput_EnumDevices() failed: %08x\n", hr); + ref = IDirectInput_Release(pDI); + ok(ref==0,"IDirectInput_Release() reference count = %d\n", ref); + } else if (hr==DIERR_OLDDIRECTINPUTVERSION) + trace(" Version Not Supported\n"); +} + START_TEST(joystick) { CoInitialize(NULL); @@ -878,5 +919,7 @@ START_TEST(joystick) joystick_tests(0x0500); joystick_tests(0x0300); + test_enum_feedback(); + CoUninitialize(); } -- 1.9.1

1 0

[PATCH] kernel32: NeedCurrentDirectoryForExePath does not use the registry.
by Vijay Kiran Kamuju 25 Apr '19

25 Apr '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> From: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/path.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index cf1c7689704..b8f49bd5975 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1991,8 +1991,7 @@ BOOL WINAPI NeedCurrentDirectoryForExePathW( LPCWSTR name ) 'I','n','E','x','e','P','a','t','h',0}; WCHAR env_val; - /* MSDN mentions some 'registry location'. We do not use registry. */ - FIXME("(%s): partial stub\n", debugstr_w(name)); + TRACE("(%s)\n", debugstr_w(name)); if (strchrW(name, '\\')) return TRUE; -- 2.17.0

2 1

[PATCH] kernel32: Add SearchPath test demonstrating the priority of the working directory.
by Vijay Kiran Kamuju 25 Apr '19

25 Apr '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> From: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/tests/path.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0a03225120b..8f5508355b8 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1820,10 +1820,11 @@ static void test_SearchPathA(void) static const CHAR testdeprelA[] = "./testdep.dll"; static const CHAR kernel32A[] = "kernel32.dll"; static const CHAR fileA[] = ""; - CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH]; - CHAR *ptrA = NULL; + CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH], path3A[MAX_PATH], curdirA[MAX_PATH]; + CHAR tmpdirA[MAX_PATH], *ptrA = NULL; ULONG_PTR cookie; HANDLE handle; + BOOL bret; DWORD ret; GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); @@ -1915,6 +1916,28 @@ static void test_SearchPathA(void) ret = pDeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); pReleaseActCtx(handle); + + /* test the search path priority of the working directory */ + GetTempPathA(sizeof(tmpdirA), tmpdirA); + ret = GetCurrentDirectoryA(MAX_PATH, curdirA); + ok(ret, "failed to obtain working directory.\n"); + sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); + ret = SearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ok(ret && ret == strlen(path2A), "got %d\n", ret); + bret = CopyFileA(path2A, pathA, FALSE); + ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError()); + sprintf(path3A, "%s%s%s", curdirA, curdirA[strlen(curdirA)-1] != '\\' ? "\\" : "", kernel32A); + bret = CopyFileA(path2A, path3A, FALSE); + ok(bret != 0, "failed to copy test executable to launch directory, %u\n", GetLastError()); + bret = SetCurrentDirectoryA(tmpdirA); + ok(bret, "failed to change working directory\n"); + ret = SearchPathA(NULL, kernel32A, ".exe", sizeof(buffA), buffA, NULL); + ok(ret && ret == strlen(buffA), "got %d\n", ret); + ok(strcmp(buffA, path3A) == 0, "expected %s, got %s\n", path3A, buffA); + bret = SetCurrentDirectoryA(curdirA); + ok(bret, "failed to reset working directory\n"); + DeleteFileA(path3A); + DeleteFileA(pathA); } static void test_SearchPathW(void) -- 2.17.0

2 1

[PATCH 1/2] dsound: Revised 5.1 to stereo downmix
by Nikola Pavlica 25 Apr '19

25 Apr '19

Signed-off-by: Nikola Pavlica <pavlica.nikola(a)gmail.com> --- dlls/dsound/dsound_convert.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 26dbb3220a..0da9823298 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -216,39 +216,37 @@ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { - /* based on pulseaudio's downmix algorithm */ + /* based on analyzing a recording of a dsound downmix */ switch(channel){ - case 4: /* back left */ - value *= 0.056f; /* (1/9) / (sum of left volumes) */ + case 4: /* surround left */ + value *= 0.24f; dsb->put_aux(dsb, pos, 0, value); break; case 0: /* front left */ - value *= 0.503f; /* 1 / (sum of left volumes) */ + value *= 1.0f; dsb->put_aux(dsb, pos, 0, value); break; - case 5: /* back right */ - value *= 0.056f; /* (1/9) / (sum of right volumes) */ + case 5: /* surround right */ + value *= 0.24f; dsb->put_aux(dsb, pos, 1, value); break; case 1: /* front right */ - value *= 0.503f; /* 1 / (sum of right volumes) */ + value *= 1.0f; dsb->put_aux(dsb, pos, 1, value); break; - case 2: /* front centre */ - value *= 0.252f; /* 0.5 / (sum of left/right volumes) */ + case 2: /* centre */ + value *= 0.7; dsb->put_aux(dsb, pos, 0, value); dsb->put_aux(dsb, pos, 1, value); break; - case 3: /* LFE */ - value *= 0.189f; /* 0.375 / (sum of left/right volumes) */ - dsb->put_aux(dsb, pos, 0, value); - dsb->put_aux(dsb, pos, 1, value); + case 3: + /* LFE is totally ignored in dsound when downmixing to 2 channels */ break; } } -- 2.21.0

2 3

← Newer
1
...
9
10
11
12
13
14
15
...
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel April 2019