August 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Add support for keyed event objects.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: dbf9d71ef80f0f689d4c0e6d06e4af69d3ea93d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf9d71ef80f0f689d4c0e6d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 12:54:17 2013 +0200 server: Add support for keyed event objects. --- dlls/ntdll/sync.c | 50 ++++++++++++++- include/wine/server_protocol.h | 41 ++++++++++++- server/event.c | 130 ++++++++++++++++++++++++++++++++++++++++ server/object.h | 3 + server/protocol.def | 20 ++++++ server/request.h | 15 +++++ server/trace.c | 31 ++++++++++ 7 files changed, 285 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbf9d71ef80f0f689d4c0…

1 0

George Stephanos : advapi32/tests: RegEnumKey and RegEnumValue tests for merged view of HKCR.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: babc0724719d9db66bfefdd6c47832c70ff4c66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=babc0724719d9db66bfefdd6c… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Tue Aug 20 21:58:42 2013 +0200 advapi32/tests: RegEnumKey and RegEnumValue tests for merged view of HKCR. --- dlls/advapi32/tests/registry.c | 178 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 197ff07..bd7e4e2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2385,6 +2385,183 @@ static void test_classesroot(void) RegCloseKey( hkcrsub2 ); } +static void test_classesroot_enum(void) +{ + HKEY hkcu=0, hklm=0, hkcr=0, hkcusub[2]={0}, hklmsub[2]={0}; + DWORD size; + static CHAR buffer[2]; + LONG res; + + /* prepare initial testing env in HKCU */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", &hkcu )) + { + delete_key( hkcu ); + RegCloseKey( hkcu ); + } + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_SET_VALUE|KEY_ENUMERATE_SUB_KEYS, NULL, &hkcu, NULL ); + + if (res != ERROR_SUCCESS) + { + skip("failed to add a user class\n"); + return; + } + + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "WineTestCls", &hkcr ); + todo_wine ok(res == ERROR_SUCCESS || + broken(res == ERROR_FILE_NOT_FOUND /* WinNT */), + "test key not found in hkcr: %d\n", res); + if (res) + { + skip("HKCR key merging not supported\n"); + delete_key( hkcu ); + RegCloseKey( hkcu ); + return; + } + + res = RegSetValueExA( hkcu, "X", 0, REG_SZ, (const BYTE *) "AA", 3 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegSetValueExA( hkcu, "Y", 0, REG_SZ, (const BYTE *) "B", 2 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegCreateKeyA( hkcu, "A", &hkcusub[0] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + res = RegCreateKeyA( hkcu, "B", &hkcusub[1] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + + /* test on values in HKCU */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Y" ), "expected 'Y', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "B" ), "expected 'B', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + /* prepare test env in HKLM */ + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", &hklm )) + { + delete_key( hklm ); + RegCloseKey( hklm ); + } + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_SET_VALUE|KEY_ENUMERATE_SUB_KEYS, NULL, &hklm, NULL ); + + if (res == ERROR_ACCESS_DENIED) + { + RegCloseKey( hkcusub[0] ); + RegCloseKey( hkcusub[1] ); + delete_key( hkcu ); + RegCloseKey( hkcu ); + RegCloseKey( hkcr ); + skip("not enough privileges to add a system class\n"); + return; + } + + res = RegSetValueExA( hklm, "X", 0, REG_SZ, (const BYTE *) "AB", 3 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegSetValueExA( hklm, "Z", 0, REG_SZ, (const BYTE *) "C", 2 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegCreateKeyA( hklm, "A", &hklmsub[0] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + res = RegCreateKeyA( hklm, "C", &hklmsub[1] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + + /* test on values/keys in both HKCU and HKLM */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Y" ), "expected 'Y', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Z" ), "expected 'Z', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 3, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "B" ), "expected 'B', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "C" ), "expected 'C', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 3, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + /* delete values/keys from HKCU to test only on HKLM */ + RegCloseKey( hkcusub[0] ); + RegCloseKey( hkcusub[1] ); + delete_key( hkcu ); + RegCloseKey( hkcu ); + + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_KEY_DELETED || + res == ERROR_NO_SYSTEM_RESOURCES, /* Windows XP */ + "expected ERROR_KEY_DELETED, got %d\n", res); + size = sizeof(buffer); + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_KEY_DELETED || + res == ERROR_NO_SYSTEM_RESOURCES, /* Windows XP */ + "expected ERROR_KEY_DELETED, got %d\n", res); + + /* reopen HKCR handle */ + RegCloseKey( hkcr ); + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "WineTestCls", &hkcr ); + ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + if (res) goto cleanup; + + /* test on values/keys in HKLM */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Z" ), "expected 'Z', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "C" ), "expected 'C', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + +cleanup: + RegCloseKey( hklmsub[0] ); + RegCloseKey( hklmsub[1] ); + delete_key( hklm ); + RegCloseKey( hklm ); + RegCloseKey( hkcr ); +} + static void test_deleted_key(void) { HKEY hkey, hkey2; @@ -2478,6 +2655,7 @@ START_TEST(registry) test_symlinks(); test_redirection(); test_classesroot(); + test_classesroot_enum(); /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ if (set_privileges(SE_BACKUP_NAME, TRUE) &&

1 0

Dmitry Timoshkov : kernel32/tests: Revert inadvertent change.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 2192745042b510b5acd8e4dc369b4be19e6d14b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2192745042b510b5acd8e4dc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:36:34 2013 +0900 kernel32/tests: Revert inadvertent change. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 12a808d..75944e9 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1628,7 +1628,7 @@ static void test_WaitRing(void) success, err, evtmask, after-before, after1-before); ok(evtmask & EV_RING, "Failed to detect EV_RING: 0x%08x, expected 0x%08x\n", - evtmask, EV_CTS); + evtmask, EV_RING); ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n"); if(defaultStat & MS_RING_ON) ok((evtmask & MS_RING_ON) == 0,"DTR didn't change state!\n");

1 0

Dmitry Timoshkov : ntdll/tests: Use NtWriteFile instead of WriteFile in order to detect broken overlapped IO implementation .
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 8ec8d70adae0ab4af5a5183ae8173f7c8a95d6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec8d70adae0ab4af5a5183ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:33:05 2013 +0900 ntdll/tests: Use NtWriteFile instead of WriteFile in order to detect broken overlapped IO implementation. --- dlls/ntdll/tests/file.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 46541d5..879c3f2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2107,38 +2107,29 @@ todo_wine todo_wine ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); - S(U(ovl)).Offset = 0; - S(U(ovl)).OffsetHigh = 0; - ovl.Internal = -1; - ovl.InternalHigh = -1; - ovl.hEvent = 0; - bytes = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, contents, sizeof(contents), &bytes, &ovl); -todo_wine - ok(!ret || broken(ret) /* see below */, "WriteFile should fail\n"); + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); todo_wine - ok(GetLastError() == ERROR_IO_PENDING || broken(GetLastError() == 0xdeadbeef), "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* see below */, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); /* even fully updated XP passes this test, but it looks like some VMs * in a testbot get never updated, so overlapped IO is broken. Instead * of fighting with broken tests and adding a bunch of broken() statements * it's better to skip further tests completely. */ - if (GetLastError() != ERROR_IO_PENDING) + if (status != STATUS_PENDING) { todo_wine win_skip("broken overlapped IO implementation, update your OS\n"); CloseHandle(hfile); return; } - ok(bytes == 0, "bytes %u\n", bytes); - ok(ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); - bytes = 0xdeadbeef; - ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); bytes = 0xdeadbeef; SetLastError(0xdeadbeef);

1 0

Henri Verbeet : d3dx9: ID3DXBaseEffectImpl doesn' t need to be a COM implementation.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 1cb70eb07a7e6d7c60771d85a21c5f34592b60aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb70eb07a7e6d7c60771d85a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 21 08:29:31 2013 +0200 d3dx9: ID3DXBaseEffectImpl doesn't need to be a COM implementation. --- dlls/d3dx9_36/effect.c | 1647 +++++++++++++++++++----------------------------- 1 files changed, 664 insertions(+), 983 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cb70eb07a7e6d7c60771…

1 0

Stefan Dösinger : wined3d: Properly allocate heap memory for volumes.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 6e4e1ad392871f9f67fbd69dd9c71eb5d74763ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4e1ad392871f9f67fbd69dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 21 15:15:49 2013 +0200 wined3d: Properly allocate heap memory for volumes. --- dlls/wined3d/volume.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 50d9a75..cdc7125 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -184,7 +184,16 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, volume, map_desc, box, flags); if (!volume->resource.allocatedMemory) - volume->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, volume->resource.size); + { + volume->resource.heap_memory = wined3d_resource_allocate_sysmem(volume->resource.size); + if (!volume->resource.heap_memory) + { + WARN("Out of memory.\n"); + map_desc->data = NULL; + return E_OUTOFMEMORY; + } + volume->resource.allocatedMemory = volume->resource.heap_memory; + } TRACE("allocatedMemory %p.\n", volume->resource.allocatedMemory);

1 0

Piotr Caban : msvcrt: Improve setting standard handles flags.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: f42c631d6e1b5c6cc16de4d329f29141dea47518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42c631d6e1b5c6cc16de4d32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 21 13:52:10 2013 +0200 msvcrt: Improve setting standard handles flags. --- dlls/msvcrt/file.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8403b4b..0df95d9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -65,6 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define WX_PIPE 0x08 #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 +#define WX_NOSEEK 0x40 #define WX_TEXT 0x80 /* values for exflag - it's used differently in msvcr90.dll*/ @@ -347,7 +348,7 @@ static int msvcrt_set_fd(HANDLE hand, int flag, int fd) } fdinfo->handle = hand; - fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE)); + fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_NOSEEK)); fdinfo->lookahead[0] = '\n'; fdinfo->lookahead[1] = '\n'; fdinfo->lookahead[2] = '\n'; @@ -515,16 +516,31 @@ void msvcrt_init_io(void) } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_INPUT_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDIN_FILENO); + } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDOUT_FILENO); + } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_ERROR_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDERR_FILENO); + } TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, @@ -2343,7 +2359,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) buf[0] = '\n'; else { buf[0] = '\r'; - if(fdinfo->wxflag & WX_PIPE) + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2391,7 +2407,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(char_len+i <= pos) i += char_len; - if(fdinfo->wxflag & WX_PIPE) { + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { if(i < pos) fdinfo->lookahead[0] = readbuf[i]; if(i+1 < pos) @@ -2419,7 +2435,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(lookahead != '\n') readbuf[j++] = '\r'; - if(fdinfo->wxflag & WX_PIPE) + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2553,7 +2569,7 @@ static int read_i(int fd, void *buf, unsigned int count) if(utf16) bufstart[j++] = 0; } - if (fdinfo->wxflag & WX_PIPE) + if (fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { fdinfo->lookahead[0] = lookahead[0]; fdinfo->lookahead[1] = lookahead[1];

1 0

George Stephanos : advapi32/tests: delete_key() permissions fix.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: 4bdba5c4021f665f9a9a7cfe7397da8210d016be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdba5c4021f665f9a9a7cfe7… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Tue Aug 20 21:58:41 2013 +0200 advapi32/tests: delete_key() permissions fix. --- dlls/advapi32/tests/registry.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1a98f91..197ff07 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -144,6 +144,7 @@ static DWORD delete_key( HKEY hkey ) char name[MAX_PATH]; DWORD ret; + if ((ret = RegOpenKeyExA( hkey, "", 0, KEY_ENUMERATE_SUB_KEYS, &hkey ))) return ret; while (!(ret = RegEnumKeyA(hkey, 0, name, sizeof(name)))) { HKEY tmp; @@ -156,6 +157,7 @@ static DWORD delete_key( HKEY hkey ) } if (ret != ERROR_NO_MORE_ITEMS) return ret; RegDeleteKeyA( hkey, "" ); + RegCloseKey(hkey); return 0; } @@ -2214,10 +2216,10 @@ static void test_classesroot(void) res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); - /* check that the value is not modified in hklm classes */ + /* check that the value is modified in hklm classes */ res = RegQueryValueExA(hklm, "val2", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); - ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return;

1 0

Dmitry Timoshkov : ntdll/tests: Fix the typos.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: b45ec4607babf8d545be66916c8d0f47c388171e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45ec4607babf8d545be66916… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:32:10 2013 +0900 ntdll/tests: Fix the typos. --- dlls/ntdll/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 37d11d1..46541d5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2243,7 +2243,7 @@ todo_wine ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "GetOverlappedResult error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); iob.Status = -1; iob.Information = -1; @@ -2254,7 +2254,7 @@ todo_wine ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "GetOverlappedResult error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n");

1 0

Andrew Eikum : dsound: For capture, use MMDevAPI event API instead of timers.
by Alexandre Julliard Aug. 21, 2013

Aug. 21, 2013

Module: wine Branch: master Commit: d5e648dc2f497a424d8cb289a7bbd7025c84d441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e648dc2f497a424d8cb289a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 21 10:16:08 2013 -0500 dsound: For capture, use MMDevAPI event API instead of timers. --- dlls/dsound/capture.c | 98 ++++++++++++++++++++++++++++++------------ dlls/dsound/dsound.c | 24 ---------- dlls/dsound/dsound_private.h | 1 - 3 files changed, 70 insertions(+), 53 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 63bda55..40f1702 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -59,6 +59,8 @@ typedef struct IDirectSoundCaptureBufferImpl /* IDirectSoundNotify fields */ DSBPOSITIONNOTIFY *notifies; int nrofnotifies; + HANDLE thread; + HANDLE sleepev; } IDirectSoundCaptureBufferImpl; /* DirectSoundCaptureDevice implementation structure */ @@ -72,7 +74,6 @@ struct DirectSoundCaptureDevice WAVEFORMATEX *pwfx; IDirectSoundCaptureBufferImpl *capture_buffer; DWORD state; - UINT timerID; CRITICAL_SECTION lock; IMMDevice *mmdevice; IAudioClient *client; @@ -80,12 +81,20 @@ struct DirectSoundCaptureDevice struct list entry; }; +static DWORD WINAPI DSOUND_capture_thread(void *user); static void capturebuffer_destroy(IDirectSoundCaptureBufferImpl *This) { if (This->device->state == STATE_CAPTURING) This->device->state = STATE_STOPPING; + if(This->thread){ + SetEvent(This->sleepev); + WaitForSingleObject(This->thread, INFINITE); + CloseHandle(This->thread); + } + CloseHandle(This->sleepev); + HeapFree(GetProcessHeap(),0, This->pdscbd); if (This->device->client) { @@ -739,8 +748,8 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( } err = IAudioClient_Initialize(device->client, - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, - 200 * 100000, 50000, device->pwfx, NULL); + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | AUDCLNT_STREAMFLAGS_EVENTCALLBACK, + 200 * 100000, 0, device->pwfx, NULL); if(FAILED(err)){ WARN("Initialize failed: %08x\n", err); IAudioClient_Release(device->client); @@ -753,12 +762,27 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( return err; } + This->sleepev = CreateEventW(NULL, 0, 0, NULL); + + err = IAudioClient_SetEventHandle(device->client, This->sleepev); + if(FAILED(err)){ + WARN("SetEventHandle failed: %08x\n", err); + IAudioClient_Release(device->client); + device->client = NULL; + CloseHandle(This->sleepev); + HeapFree(GetProcessHeap(), 0, This->pdscbd); + This->device->capture_buffer = 0; + HeapFree( GetProcessHeap(), 0, This ); + return err; + } + err = IAudioClient_GetService(device->client, &IID_IAudioCaptureClient, (void**)&device->capture); if(FAILED(err)){ WARN("GetService failed: %08x\n", err); IAudioClient_Release(device->client); device->client = NULL; + CloseHandle(This->sleepev); HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); @@ -776,6 +800,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( device->client = NULL; IAudioCaptureClient_Release(device->capture); device->capture = NULL; + CloseHandle(This->sleepev); HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); @@ -783,6 +808,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( } device->buffer = newbuf; device->buflen = buflen; + This->thread = CreateThread(NULL, 0, DSOUND_capture_thread, This, 0, NULL); } IDirectSoundCaptureBuffer_AddRef(&This->IDirectSoundCaptureBuffer8_iface); @@ -830,9 +856,6 @@ static ULONG DirectSoundCaptureDevice_Release( if (!ref) { TRACE("deleting object\n"); - timeKillEvent(device->timerID); - timeEndPeriod(DS_TIME_RES); - EnterCriticalSection(&DSOUND_capturers_lock); list_remove(&device->entry); LeaveCriticalSection(&DSOUND_capturers_lock); @@ -851,29 +874,19 @@ static ULONG DirectSoundCaptureDevice_Release( return ref; } -static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user, - DWORD_PTR dw1, DWORD_PTR dw2) +static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) { - DirectSoundCaptureDevice *device = (DirectSoundCaptureDevice*)user; + HRESULT hr; UINT32 packet_frames, packet_bytes, avail_bytes, skip_bytes = 0; DWORD flags; BYTE *buf; - HRESULT hr; - - if(!device->ref) - return; - EnterCriticalSection(&device->lock); - - if(!device->capture_buffer || device->state == STATE_STOPPED){ - LeaveCriticalSection(&device->lock); - return; - } + if(!device->capture_buffer || device->state == STATE_STOPPED) + return S_FALSE; if(device->state == STATE_STOPPING){ device->state = STATE_STOPPED; - LeaveCriticalSection(&device->lock); - return; + return S_FALSE; } if(device->state == STATE_STARTING) @@ -882,9 +895,8 @@ static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, &flags, NULL, NULL); if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); WARN("GetBuffer failed: %08x\n", hr); - return; + return hr; } packet_bytes = packet_frames * device->pwfx->nBlockAlign; @@ -917,12 +929,44 @@ static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); WARN("ReleaseBuffer failed: %08x\n", hr); - return; + return hr; } - LeaveCriticalSection(&device->lock); + return S_OK; +} + +static DWORD WINAPI DSOUND_capture_thread(void *user) +{ + IDirectSoundCaptureBufferImpl *buffer = user; + HRESULT hr; + DWORD ret, wait_ms; + REFERENCE_TIME period; + + hr = IAudioClient_GetDevicePeriod(buffer->device->client, &period, NULL); + if(FAILED(hr)){ + WARN("GetDevicePeriod failed: %08x\n", hr); + wait_ms = 5; + }else + wait_ms = MulDiv(5, period, 10000); + + while(buffer->ref){ + ret = WaitForSingleObject(buffer->sleepev, wait_ms); + + if(!buffer->device->ref) + break; + + if(ret == WAIT_OBJECT_0){ + EnterCriticalSection(&buffer->device->lock); + + DSOUND_capture_data(buffer->device); + + LeaveCriticalSection(&buffer->device->lock); + }else if(ret != WAIT_TIMEOUT) + WARN("WaitForSingleObject failed: %u\n", GetLastError()); + } + + return 0; } static struct _TestFormat { @@ -1020,8 +1064,6 @@ static HRESULT DirectSoundCaptureDevice_Initialize( } IAudioClient_Release(client); - device->timerID = DSOUND_create_timer(DSOUND_capture_timer, (DWORD_PTR)device); - list_add_tail(&DSOUND_capturers, &device->entry); *ppDevice = device; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 381d0e1..986168b 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -735,30 +735,6 @@ BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, return hr == S_OK; } -UINT DSOUND_create_timer(LPTIMECALLBACK cb, DWORD_PTR user) -{ - UINT triggertime = DS_TIME_DEL, res = DS_TIME_RES, id; - TIMECAPS time; - - timeGetDevCaps(&time, sizeof(TIMECAPS)); - TRACE("Minimum timer resolution: %u, max timer: %u\n", time.wPeriodMin, time.wPeriodMax); - if (triggertime < time.wPeriodMin) - triggertime = time.wPeriodMin; - if (res < time.wPeriodMin) - res = time.wPeriodMin; - if (timeBeginPeriod(res) == TIMERR_NOCANDO) - WARN("Could not set minimum resolution, don't expect sound\n"); - id = timeSetEvent(triggertime, res, cb, user, TIME_PERIODIC | TIME_KILL_SYNCHRONOUS); - if (!id) - { - WARN("Timer not created! Retrying without TIME_KILL_SYNCHRONOUS\n"); - id = timeSetEvent(triggertime, res, cb, user, TIME_PERIODIC); - if (!id) - ERR("Could not create timer, sound playback will not occur\n"); - } - return id; -} - HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcGUID) { HRESULT hr = DS_OK; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 1a3900c..a8f5f42 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -261,6 +261,5 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) DECLSP BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels) DECLSPEC_HIDDEN; -UINT DSOUND_create_timer(LPTIMECALLBACK cb, DWORD_PTR user) DECLSPEC_HIDDEN; HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, LPDSENUMCALLBACKW cb, void *user) DECLSPEC_HIDDEN;

1 0