October 2015 - Wine-commits

Bruno Jesus : winmm: Initialize struct MMIOINFO in MMIO_Open.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 54ecab2479119388c815c86efeb28526e3d18d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ecab2479119388c815c86ef… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Oct 25 12:38:38 2015 +0800 winmm: Initialize struct MMIOINFO in MMIO_Open. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 6 +----- dlls/winmm/tests/mmio.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index ad73564..bc69f9e 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -591,11 +591,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, if (!refmminfo) { refmminfo = &mmioinfo; - - mmioinfo.fccIOProc = 0; - mmioinfo.pIOProc = NULL; - mmioinfo.pchBuffer = NULL; - mmioinfo.cchBuffer = 0; + memset(&mmioinfo, 0, sizeof(mmioinfo)); is_unicode = FALSE; } diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index fd5433c..48367ee 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -599,12 +599,15 @@ static void test_mmioSetBuffer(char *fname) static LRESULT CALLBACK mmio_test_IOProc(LPSTR lpMMIOInfo, UINT uMessage, LPARAM lParam1, LPARAM lParam2) { LPMMIOINFO lpInfo = (LPMMIOINFO) lpMMIOInfo; + int i; switch (uMessage) { case MMIOM_OPEN: if (lpInfo->fccIOProc == FOURCC_DOS) lpInfo->fccIOProc = mmioFOURCC('F', 'A', 'I', 'L'); + for (i = 0; i < sizeof(lpInfo->adwInfo) / sizeof(*lpInfo->adwInfo); i++) + ok(lpInfo->adwInfo[i] == 0, "[%d] Expected 0, got %u\n", i, lpInfo->adwInfo[i]); return MMSYSERR_NOERROR; case MMIOM_CLOSE: return MMSYSERR_NOERROR; @@ -642,6 +645,18 @@ static void test_mmioOpen_fourcc(void) mmio.lDiskOffset); mmioClose(hmmio, 0); + /* Same test with NULL info */ + memset(&mmio, 0, sizeof(mmio)); + hmmio = mmioOpenA(fname, NULL, MMIO_READ); + mmioGetInfo(hmmio, &mmio, 0); + ok(hmmio && mmio.fccIOProc == FOURCC_XYZ, "mmioOpenA error %u, got %4.4s\n", + mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); + ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %d\n", + mmio.adwInfo[1]); + ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %d\n", + mmio.lDiskOffset); + mmioClose(hmmio, 0); + mmioInstallIOProcA(FOURCC_XYZ, NULL, MMIO_REMOVEPROC); memset(&mmio, 0, sizeof(mmio));

1 0

Sebastian Lackner : ws2_32: Use wine_server_release_fd to close file descriptor.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 5529fc736ee4ab5f3168f2ca5e2f76c8b778348c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5529fc736ee4ab5f3168f2ca5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 25 01:10:18 2015 +0200 ws2_32: Use wine_server_release_fd to close file descriptor. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b0cbb11..1cad112 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2776,7 +2776,7 @@ static NTSTATUS WS2_ReadFile(HANDLE hFile, PIO_STATUS_BLOCK io_status, char* buf else status = STATUS_PENDING; - close( unix_handle ); + wine_server_release_fd( hFile, unix_handle ); TRACE("= 0x%08x (%d)\n", status, result); if (status == STATUS_SUCCESS || status == STATUS_END_OF_FILE) {

1 0

Sebastian Lackner : kernel32/tests: Add tests for triggering write watches in asynchronous ReadFile call.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 536d7d98feb9f3a8ad7867574b27e65bb9ebfa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536d7d98feb9f3a8ad7867574… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 25 04:28:19 2015 +0100 kernel32/tests: Add tests for triggering write watches in asynchronous ReadFile call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 67 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 244fa9d..e80ba38 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1436,12 +1436,17 @@ static void test_IsBadCodePtr(void) static void test_write_watch(void) { - char *base; - DWORD ret, size, old_prot; + static const char pipename[] = "\\\\.\\pipe\\test_write_watch_pipe"; + static const char testdata[] = "Hello World"; + DWORD ret, size, old_prot, num_bytes; MEMORY_BASIC_INFORMATION info; + HANDLE readpipe, writepipe; + OVERLAPPED overlapped; void *results[64]; ULONG_PTR count; ULONG pagesize; + BOOL success; + char *base; if (!pGetWriteWatch || !pResetWriteWatch) { @@ -1589,6 +1594,64 @@ static void test_write_watch(void) ok( info.State == MEM_COMMIT, "wrong State 0x%x\n", info.State ); ok( info.Protect == PAGE_READWRITE, "wrong Protect 0x%x\n", info.Protect ); + /* ReadFile should trigger write watches */ + + memset( &overlapped, 0, sizeof(overlapped) ); + overlapped.hEvent = CreateEventA( NULL, TRUE, FALSE, NULL ); + + readpipe = CreateNamedPipeA( pipename, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_INBOUND, + PIPE_TYPE_BYTE | PIPE_WAIT, 1, 1024, 1024, + NMPWAIT_USE_DEFAULT_WAIT, NULL ); + ok( readpipe != INVALID_HANDLE_VALUE, "CreateNamedPipeA failed %u\n", GetLastError() ); + + success = ConnectNamedPipe( readpipe, &overlapped ); + ok( !success, "ConnectNamedPipe unexpectedly succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + + writepipe = CreateFileA( pipename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok( writepipe != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError() ); + + ret = WaitForSingleObject( overlapped.hEvent, 1000 ); + ok( ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret ); + + memset( base, 0, size ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + success = ReadFile( readpipe, base, size, NULL, &overlapped ); + ok( !success, "ReadFile unexpectedly succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + num_bytes = 0; + success = WriteFile( writepipe, testdata, sizeof(testdata), &num_bytes, NULL ); + ok( success, "WriteFile failed %u\n", GetLastError() ); + ok( num_bytes == sizeof(testdata), "wrong number of bytes written\n" ); + + num_bytes = 0; + success = GetOverlappedResult( readpipe, &overlapped, &num_bytes, TRUE ); + todo_wine ok( success, "GetOverlappedResult failed %u\n", GetLastError() ); + todo_wine ok( num_bytes == sizeof(testdata), "wrong number of bytes read\n" ); + todo_wine ok( !memcmp( base, testdata, sizeof(testdata)), "didn't receive expected data\n" ); + + count = 64; + memset( results, 0, sizeof(results) ); + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + todo_wine ok( count == 1, "wrong count %lu\n", count ); + todo_wine ok( results[0] == base, "wrong result %p\n", results[0] ); + + CloseHandle( readpipe ); + CloseHandle( writepipe ); + CloseHandle( overlapped.hEvent ); + /* some invalid parameter tests */ SetLastError( 0xdeadbeef );

1 0

Alex Henrie : krnl386.exe16: Fix dialog size computation.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 005de9e94c548ea99af271c0aae94d39bda2d642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005de9e94c548ea99af271c0a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 23 19:36:48 2015 -0600 krnl386.exe16: Fix dialog size computation. This partially reverts commit a5bf67ef9b5f85ad66e722184bf828a79e0191a7, "kernel: Constify some formal parameters." Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/resource.c | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c index e05ea41..da54f6d 100644 --- a/dlls/krnl386.exe16/resource.c +++ b/dlls/krnl386.exe16/resource.c @@ -596,24 +596,24 @@ WORD WINAPI GetDialog32Size16( LPCVOID dialog32 ) p = (const DWORD *)p + 1; /* exStyle */ nbItems = get_word(&p); - p = (const DWORD *)p + 1; /* x */ - p = (const DWORD *)p + 1; /* y */ - p = (const DWORD *)p + 1; /* cx */ - p = (const DWORD *)p + 1; /* cy */ + p = (const WORD *)p + 1; /* x */ + p = (const WORD *)p + 1; /* y */ + p = (const WORD *)p + 1; /* cx */ + p = (const WORD *)p + 1; /* cy */ /* Skip menu name */ - switch (*(const DWORD *)p) + switch (*(const WORD *)p) { - case 0x0000: p = (const DWORD *)p + 1; break; - case 0xffff: p = (const DWORD *)p + 2; break; + case 0x0000: p = (const WORD *)p + 1; break; + case 0xffff: p = (const WORD *)p + 2; break; default: p = (LPCWSTR)p + strlenW( p ) + 1; break; } /* Skip class name */ - switch (*(const DWORD *)p) + switch (*(const WORD *)p) { - case 0x0000: p = (const DWORD *)p + 1; break; - case 0xffff: p = (const DWORD *)p + 2; break; + case 0x0000: p = (const WORD *)p + 1; break; + case 0xffff: p = (const WORD *)p + 2; break; default: p = (LPCWSTR)p + strlenW( p ) + 1; break; } @@ -623,11 +623,11 @@ WORD WINAPI GetDialog32Size16( LPCVOID dialog32 ) /* Skip font info */ if (style & DS_SETFONT) { - p = (const DWORD *)p + 1; /* pointSize */ + p = (const WORD *)p + 1; /* pointSize */ if (dialogEx) { - p = (const DWORD *)p + 1; /* weight */ - p = (const DWORD *)p + 1; /* italic */ + p = (const WORD *)p + 1; /* weight */ + p = (const WORD *)p + 1; /* italic */ } p = (LPCWSTR)p + strlenW( p ) + 1; /* faceName */ } @@ -650,29 +650,29 @@ WORD WINAPI GetDialog32Size16( LPCVOID dialog32 ) p = (const DWORD *)p + 1; /* exStyle */ } - p = (const DWORD *)p + 1; /* x */ - p = (const DWORD *)p + 1; /* y */ - p = (const DWORD *)p + 1; /* cx */ - p = (const DWORD *)p + 1; /* cy */ + p = (const WORD *)p + 1; /* x */ + p = (const WORD *)p + 1; /* y */ + p = (const WORD *)p + 1; /* cx */ + p = (const WORD *)p + 1; /* cy */ if (dialogEx) p = (const DWORD *)p + 1; /* ID */ else - p = (const DWORD *)p + 1; /* ID */ + p = (const WORD *)p + 1; /* ID */ /* Skip class name */ - switch (*(const DWORD *)p) + switch (*(const WORD *)p) { - case 0x0000: p = (const DWORD *)p + 1; break; - case 0xffff: p = (const DWORD *)p + 2; break; + case 0x0000: p = (const WORD *)p + 1; break; + case 0xffff: p = (const WORD *)p + 2; break; default: p = (LPCWSTR)p + strlenW( p ) + 1; break; } /* Skip window name */ - switch (*(const DWORD *)p) + switch (*(const WORD *)p) { - case 0x0000: p = (const DWORD *)p + 1; break; - case 0xffff: p = (const DWORD *)p + 2; break; + case 0x0000: p = (const WORD *)p + 1; break; + case 0xffff: p = (const WORD *)p + 2; break; default: p = (LPCWSTR)p + strlenW( p ) + 1; break; }

1 0

Pierre Schweitzer : msacm32.drv: Don't dereference a pointer after free.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 711188469e481777f1ece53d2d4086fad4e26676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=711188469e481777f1ece53d2… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Oct 24 10:55:18 2015 +0200 msacm32.drv: Don't dereference a pointer after free. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32.drv/wavemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 8a9557d..0abc8bd 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -852,8 +852,8 @@ found: HeapFree(GetProcessHeap(), 0, wim); } else { *lpdwUser = (DWORD_PTR)wim; + TRACE("Ok (stream=%p)\n", wim->hAcmStream); } - TRACE("Ok (stream=%p)\n", wim->hAcmStream); return MMSYSERR_NOERROR; error: HeapFree(GetProcessHeap(), 0, wim);

1 0

Nikolay Sivov : user32: Added a GetDisplayConfigBufferSizes stub.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 8b353f5409c205d4643ece3a42fcd9aa47460566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b353f5409c205d4643ece3a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 21:40:50 2015 +0300 user32: Added a GetDisplayConfigBufferSizes stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 14 ++++++++++++ dlls/user32/tests/monitor.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/wingdi.h | 5 +++++ include/winuser.h | 1 + 5 files changed, 76 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d2b4b73..33016a1 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -757,6 +757,20 @@ BOOL WINAPI IsWindowRedirectedForPrint( HWND hwnd ) return FALSE; } +/********************************************************************** + * GetDisplayConfigBufferSizes [USER32.@] + */ +LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) +{ + FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); + + if (!num_path_info || !num_mode_info) + return ERROR_INVALID_PARAMETER; + + *num_path_info = 0; + *num_mode_info = 0; + return ERROR_NOT_SUPPORTED; +} static const WCHAR imeW[] = {'I','M','E',0}; const struct builtin_class_descr IME_builtin_class = diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 42ae883..864eb85 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -34,6 +34,7 @@ static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); +static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); static void init_function_pointers(void) { @@ -48,6 +49,7 @@ static void init_function_pointers(void) GET_PROC(ChangeDisplaySettingsExW) GET_PROC(EnumDisplayDevicesA) GET_PROC(EnumDisplayMonitors) + GET_PROC(GetDisplayConfigBufferSizes) GET_PROC(GetMonitorInfoA) GET_PROC(GetMonitorInfoW) GET_PROC(MonitorFromPoint) @@ -543,6 +545,58 @@ static void test_work_area(void) DestroyWindow(hwnd); } +static void test_display_config(void) +{ + UINT32 paths, modes; + LONG ret; + + if (!pGetDisplayConfigBufferSizes) + { + win_skip("GetDisplayConfigBufferSizes is not supported\n"); + return; + } + + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = 100; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(paths == 100, "got %u\n", paths); + + modes = 100; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, &modes); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(modes == 100, "got %u\n", modes); + + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + /* Invalid flags, non-zero invalid flags validation is version (or driver?) dependent, + it's unreliable to use in tests. */ + ret = pGetDisplayConfigBufferSizes(0, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = 100; + ret = pGetDisplayConfigBufferSizes(0, &paths, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(paths == 100, "got %u\n", paths); + + modes = 100; + ret = pGetDisplayConfigBufferSizes(0, NULL, &modes); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(modes == 100, "got %u\n", modes); + + paths = modes = 100; + ret = pGetDisplayConfigBufferSizes(0, &paths, &modes); + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + ok(modes == 0 && paths == 0, "got %u, %u\n", modes, paths); +} + START_TEST(monitor) { init_function_pointers(); @@ -550,4 +604,5 @@ START_TEST(monitor) test_ChangeDisplaySettingsEx(); test_monitors(); test_work_area(); + test_display_config(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f0e541f..9b409df 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -281,6 +281,7 @@ @ stdcall GetDCEx(long long long) @ stdcall GetDesktopWindow() @ stdcall GetDialogBaseUnits() +@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) @ stdcall GetDlgCtrlID(long) @ stdcall GetDlgItem(long long) @ stdcall GetDlgItemInt(long long ptr long) diff --git a/include/wingdi.h b/include/wingdi.h index e860f2c..f6fd6fe 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3306,6 +3306,11 @@ DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +/* For GetDisplayConfigBufferSizes */ +#define QDC_ALL_PATHS 0x00000001 +#define QDC_ONLY_ACTIVE_PATHS 0x00000002 +#define QDC_DATABASE_CURRENT 0x00000004 + #define GDI_ERROR (~0u) #define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0) diff --git a/include/winuser.h b/include/winuser.h index 06ca054..1d3759a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3267,6 +3267,7 @@ WINUSERAPI BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,LPDEVMODEW); WINUSERAPI BOOL WINAPI EnumDisplaySettingsExA(LPCSTR,DWORD,LPDEVMODEA,DWORD); WINUSERAPI BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR,DWORD,LPDEVMODEW,DWORD); #define EnumDisplaySettingsEx WINELIB_NAME_AW(EnumDisplaySettingsEx) +WINUSERAPI LONG WINAPI GetDisplayConfigBufferSizes(UINT32,UINT32*,UINT32*); WINUSERAPI BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); WINUSERAPI BOOL WINAPI UpdateLayeredWindowIndirect(HWND,UPDATELAYEREDWINDOWINFO const*); #endif /* defined(_WINGDI_) && !defined(NOGDI) */

1 0

Andrew Eikum : xaudio2: Implement CreateFX for legacy xaudio2 versions.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 539d7fb4e406375c83d372c9b3c972babf9dbf73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=539d7fb4e406375c83d372c9b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 23 14:31:09 2015 -0500 xaudio2: Implement CreateFX for legacy xaudio2 versions. The various xapofx versions all use the same CLSID to identify the same effect types. In order to differentiate the versions in Wine without duplicating a ton of code into each xapofx DLL, I made new internal CLSIDs for each version of xapofx, which xaudio2_7 registers and uses to tell them apart. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xapofx1_1/Makefile.in | 1 + dlls/xapofx1_1/main.c | 16 +++++ dlls/xapofx1_1/xapofx1_1.spec | 2 +- dlls/xapofx1_2/Makefile.in | 1 + dlls/xapofx1_2/main.c | 16 +++++ dlls/xapofx1_2/xapofx1_2.spec | 2 +- dlls/xapofx1_3/Makefile.in | 1 + dlls/xapofx1_3/main.c | 20 +++++- dlls/xapofx1_3/xapofx1_3.spec | 2 +- dlls/xapofx1_4/Makefile.in | 1 + dlls/xapofx1_4/main.c | 21 +++++- dlls/xapofx1_4/xapofx1_4.spec | 2 +- dlls/xapofx1_5/main.c | 12 +++- dlls/xaudio2_7/tests/xaudio2.c | 137 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 35 ++++++++++ dlls/xaudio2_7/xaudio_dll.c | 49 +++++++++----- include/Makefile.in | 1 + include/xapofx.h | 76 +++++++++++++++++++++ 18 files changed, 372 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=539d7fb4e406375c83d37…

1 0

Andrew Eikum : xaudio2_8: Implement CreateFX.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 05111fd81583bc9389c0c3e90e7eee2ed17fe392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05111fd81583bc9389c0c3e90… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 23 14:31:19 2015 -0500 xaudio2_8: Implement CreateFX. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 108 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 7 +++ dlls/xaudio2_8/xaudio2_8.spec | 2 + dlls/xaudio2_8/xaudio_dll.c | 45 ++++++++++++++++ 4 files changed, 162 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 7d7ee17..a664817 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -903,6 +903,113 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) FreeLibrary(xapofxdll); } +static void test_xapo_creation_modern(const char *module) +{ + HANDLE xaudio2dll; + HRESULT hr; + IUnknown *fx_unk; + unsigned int i; + + HRESULT (CDECL *pCreateFX)(REFCLSID,IUnknown**,void*,UINT32) = NULL; + HRESULT (WINAPI *pCAVM)(IUnknown**) = NULL; + HRESULT (WINAPI *pCAR)(IUnknown**) = NULL; + + /* CLSIDs are the same across all versions */ + static struct { + const GUID *clsid; + BOOL todo; + } const_clsids[] = { + { &CLSID_FXEQ27, TRUE }, + { &CLSID_FXMasteringLimiter27, TRUE }, + { &CLSID_FXReverb27, FALSE }, + { &CLSID_FXEcho27, TRUE}, + /* older versions of xapofx actually have support for new clsids */ + { &CLSID_FXEQ, TRUE }, + { &CLSID_FXMasteringLimiter, TRUE }, + { &CLSID_FXReverb, FALSE }, + { &CLSID_FXEcho, TRUE} + }; + + xaudio2dll = LoadLibraryA(module); + if(xaudio2dll){ + pCreateFX = (void*)GetProcAddress(xaudio2dll, "CreateFX"); + ok(pCreateFX != NULL, "%s did not have CreateFX?\n", module); + if(!pCreateFX){ + FreeLibrary(xaudio2dll); + return; + } + }else{ + win_skip("Couldn't load %s\n", module); + return; + } + + if(pCreateFX){ + for(i = 0; i < sizeof(const_clsids) / sizeof(*const_clsids); ++i){ + hr = pCreateFX(const_clsids[i].clsid, &fx_unk, NULL, 0); + if(const_clsids[i].todo) + todo_wine ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); + else + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); + } + + hr = CoCreateInstance(const_clsids[i].clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&fx_unk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + if(SUCCEEDED(hr)) + IUnknown_Release(fx_unk); + } + + /* test legacy CLSID */ + hr = pCreateFX(&CLSID_AudioVolumeMeter, &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); + } + } + + pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); + ok(pCAVM != NULL, "%s did not have CreateAudioVolumeMeter?\n", module); + + hr = pCAVM(&fx_unk); + ok(hr == S_OK, "CreateAudioVolumeMeter failed: %08x\n", hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); + } + + pCAR = (void*)GetProcAddress(xaudio2dll, "CreateAudioReverb"); + ok(pCAR != NULL, "%s did not have CreateAudioReverb?\n", module); + + hr = pCAR(&fx_unk); + ok(hr == S_OK, "CreateAudioReverb failed: %08x\n", hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); + } + + FreeLibrary(xaudio2dll); +} + static void test_xapo_creation(void) { test_xapo_creation_legacy("xapofx1_1.dll", 22); @@ -911,6 +1018,7 @@ static void test_xapo_creation(void) test_xapo_creation_legacy("xapofx1_3.dll", 25); test_xapo_creation_legacy("xapofx1_4.dll", 26); test_xapo_creation_legacy("xapofx1_5.dll", 27); + test_xapo_creation_modern("xaudio2_8.dll"); } static UINT32 check_has_devices(IXAudio2 *xa) diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 1f8b020..42a8cbf 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -82,3 +82,10 @@ coclass FXReverb14 { interface IXAPO; } uuid(a90bc001-e897-e897-7439-43FF02000105) ] coclass FXReverb15 { interface IXAPO; } + +[ + helpstring("XAudio2.8 FXReverb Class (Wine)"), + threading(both), + uuid(a90bc001-e897-e897-7439-43FF02000208) +] +coclass FXReverb28 { interface IXAPO; } diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec index 3228d71..09032f9 100644 --- a/dlls/xaudio2_8/xaudio2_8.spec +++ b/dlls/xaudio2_8/xaudio2_8.spec @@ -1,2 +1,4 @@ @ stdcall XAudio2Create(ptr long long) @ stdcall CreateAudioVolumeMeter(ptr) +@ stdcall CreateAudioReverb(ptr) +@ cdecl CreateFX(ptr ptr ptr long) diff --git a/dlls/xaudio2_8/xaudio_dll.c b/dlls/xaudio2_8/xaudio_dll.c index 4a73783..b1c5fd4 100644 --- a/dlls/xaudio2_8/xaudio_dll.c +++ b/dlls/xaudio2_8/xaudio_dll.c @@ -23,11 +23,15 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "wine/debug.h" #include "initguid.h" #include "xaudio2.h" #include "xaudio2fx.h" #include "xapo.h" +#include "xapofx.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -85,3 +89,44 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) return CoCreateInstance(&CLSID_AudioReverb, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); } + +HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 initdata_bytes) +{ + HRESULT hr; + IUnknown *obj; + const GUID *class; + + *out = NULL; + class = clsid; + + if(IsEqualGUID(clsid, &CLSID_FXReverb27) || + IsEqualGUID(clsid, &CLSID_FXReverb)) + class = &CLSID_WINE_FXReverb28; + + hr = CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj); + if(FAILED(hr)){ + WARN("CoCreateInstance failed: %08x\n", hr); + return hr; + } + + if(initdata && initdata_bytes > 0){ + IXAPO *xapo; + + hr = IUnknown_QueryInterface(obj, &IID_IXAPO, (void**)&xapo); + if(SUCCEEDED(hr)){ + hr = IXAPO_Initialize(xapo, initdata, initdata_bytes); + + IXAPO_Release(xapo); + + if(FAILED(hr)){ + WARN("Initialize failed: %08x\n", hr); + IUnknown_Release(obj); + return hr; + } + } + } + + *out = obj; + + return S_OK; +}

1 0

Sebastian Lackner : combase: Add TRACEs to string functions.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 1173967ea98ee11c4301ce5610f02dd73a66830c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1173967ea98ee11c4301ce561… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 25 15:32:15 2015 +0100 combase: Add TRACEs to string functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/string.c | 37 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index 825980d..f629bcf 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -8,7 +8,7 @@ @ stub HSTRING_UserUnmarshal64 @ stub WindowsCompareStringOrdinal @ stub WindowsConcatString -@ stdcall WindowsCreateString(ptr long ptr) combase.WindowsCreateString +@ stdcall WindowsCreateString(wstr long ptr) combase.WindowsCreateString @ stdcall WindowsCreateStringReference(wstr long ptr ptr) combase.WindowsCreateStringReference @ stdcall WindowsDeleteString(ptr) combase.WindowsDeleteString @ stdcall WindowsDeleteStringBuffer(ptr) combase.WindowsDeleteStringBuffer diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index bf8607a..e7c8866 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -289,7 +289,7 @@ @ stub WdtpInterfacePointer_UserUnmarshal64 @ stub WindowsCompareStringOrdinal @ stub WindowsConcatString -@ stdcall WindowsCreateString(ptr long ptr) +@ stdcall WindowsCreateString(wstr long ptr) @ stdcall WindowsCreateStringReference(wstr long ptr ptr) @ stdcall WindowsDeleteString(ptr) @ stdcall WindowsDeleteStringBuffer(ptr) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 33e5100..53a32c9 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -21,7 +21,9 @@ #include "windows.h" #include "winerror.h" #include "hstring.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(winstring); struct hstring_private { @@ -72,6 +74,9 @@ HRESULT WINAPI WindowsCreateString(LPCWSTR ptr, UINT32 len, HSTRING *out) { struct hstring_private *priv; + + TRACE("(%s, %u, %p)\n", debugstr_wn(ptr, len), len, out); + if (out == NULL) return E_INVALIDARG; if (ptr == NULL && len > 0) @@ -95,6 +100,9 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, HSTRING_HEADER *header, HSTRING *out) { struct hstring_private *priv = impl_from_HSTRING_HEADER(header); + + TRACE("(%s, %u, %p, %p)\n", debugstr_wn(ptr, len), len, header, out); + if (out == NULL || header == NULL) return E_INVALIDARG; if (ptr == NULL && len > 0) @@ -119,6 +127,9 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, HRESULT WINAPI WindowsDeleteString(HSTRING str) { struct hstring_private *priv = impl_from_HSTRING(str); + + TRACE("(%p)\n", str); + if (str == NULL) return S_OK; if (priv->reference) @@ -134,6 +145,9 @@ HRESULT WINAPI WindowsDeleteString(HSTRING str) HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) { struct hstring_private *priv = impl_from_HSTRING(str); + + TRACE("(%p, %p)\n", str, out); + if (out == NULL) return E_INVALIDARG; if (str == NULL) @@ -156,6 +170,9 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, { struct hstring_private *priv; HSTRING str; + + TRACE("(%u, %p, %p)\n", len, outptr, out); + if (outptr == NULL || out == NULL) return E_POINTER; if (len == 0) @@ -178,6 +195,8 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, */ HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) { + TRACE("(%p)\n", buf); + return WindowsDeleteString((HSTRING)buf); } @@ -187,6 +206,9 @@ HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) { struct hstring_private *priv = impl_from_HSTRING_BUFFER(buf); + + TRACE("(%p, %p)\n", buf, out); + if (out == NULL) return E_POINTER; if (buf == NULL) @@ -206,6 +228,9 @@ HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) UINT32 WINAPI WindowsGetStringLen(HSTRING str) { struct hstring_private *priv = impl_from_HSTRING(str); + + TRACE("(%p)\n", str); + if (str == NULL) return 0; return priv->length; @@ -217,6 +242,9 @@ UINT32 WINAPI WindowsGetStringLen(HSTRING str) LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len) { struct hstring_private *priv = impl_from_HSTRING(str); + + TRACE("(%p, %p)\n", str, len); + if (str == NULL) { if (len) @@ -235,6 +263,9 @@ HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) { UINT32 i; struct hstring_private *priv = impl_from_HSTRING(str); + + TRACE("(%p, %p)\n", str, out); + if (out == NULL) return E_INVALIDARG; if (str == NULL) @@ -261,6 +292,9 @@ HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) { struct hstring_private *priv = impl_from_HSTRING(str); UINT32 len = WindowsGetStringLen(str); + + TRACE("(%p, %u, %p)\n", str, start, out); + if (out == NULL) return E_INVALIDARG; if (start > len) @@ -279,6 +313,9 @@ HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) BOOL WINAPI WindowsIsStringEmpty(HSTRING str) { struct hstring_private *priv = impl_from_HSTRING(str); + + TRACE("(%p)\n", str); + if (str == NULL) return TRUE; return priv->length == 0;

1 0

Sebastian Lackner : kernel32/tests: Add test to show that multiple user APCs are processed at once.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 49dd5577eba8b270386e4b4187ba50a6ddc2725e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dd5577eba8b270386e4b418… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 23 04:15:52 2015 +0200 kernel32/tests: Add test to show that multiple user APCs are processed at once. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index e842bf3..173793c 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2333,6 +2333,13 @@ static DWORD WINAPI alertable_wait_thread(void *param) todo_wine ok(status == STATUS_WAIT_0, "expected STATUS_WAIT_0, got %08x\n", status); + ReleaseSemaphore(semaphores[0], 1, NULL); + timeout.QuadPart = -10000000; + status = pNtWaitForMultipleObjects(1, &semaphores[1], FALSE, TRUE, &timeout); + ok(status == STATUS_USER_APC, "expected STATUS_USER_APC, got %08x\n", status); + result = WaitForSingleObject(semaphores[0], 0); + ok(result == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", result); + return 0; } @@ -2342,12 +2349,21 @@ static void CALLBACK alertable_wait_apc(ULONG_PTR userdata) ReleaseSemaphore(semaphores[1], 1, NULL); } +static void CALLBACK alertable_wait_apc2(ULONG_PTR userdata) +{ + HANDLE *semaphores = (void *)userdata; + DWORD result; + + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); +} + static void test_alertable_wait(void) { HANDLE thread, semaphores[2]; DWORD result; - semaphores[0] = CreateSemaphoreW(NULL, 0, 1, NULL); + semaphores[0] = CreateSemaphoreW(NULL, 0, 2, NULL); ok(semaphores[0] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); semaphores[1] = CreateSemaphoreW(NULL, 0, 1, NULL); ok(semaphores[1] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); @@ -2366,6 +2382,15 @@ static void test_alertable_wait(void) result = QueueUserAPC(alertable_wait_apc, thread, (ULONG_PTR)semaphores); ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + Sleep(100); /* ensure the thread is blocking in NtWaitForMultipleObjects */ + result = QueueUserAPC(alertable_wait_apc2, thread, (ULONG_PTR)semaphores); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + result = QueueUserAPC(alertable_wait_apc2, thread, (ULONG_PTR)semaphores); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + ReleaseSemaphore(semaphores[0], 2, NULL); + result = WaitForSingleObject(thread, 1000); ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); CloseHandle(thread);

1 0