wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Bruno Jesus : ws2_32: Filter unset bits when argument is smaller than 32 bits.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: d7a8beb0f766d2cbbbf682ca8846ce6ab96ca855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a8beb0f766d2cbbbf682ca8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 5 02:26:34 2014 -0200 ws2_32: Filter unset bits when argument is smaller than 32 bits. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ebafed5..1864dfd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5013,6 +5013,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, { woptval= *((const INT16 *) optval); optval= (char*) &woptval; + woptval&= (1 << optlen * 8) - 1; optlen=sizeof(int); } fd = get_sock_fd( s, 0, NULL ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 52a4e1e..f0946c9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1374,6 +1374,23 @@ todo_wine closesocket(s); + /* Test WS_IP_MULTICAST_TTL with 8, 16, 24 and 32 bits values */ + s = socket(AF_INET, SOCK_DGRAM, 0); + ok(s != INVALID_SOCKET, "Failed to create socket\n"); + size = sizeof(i); + for (i = 0; i < 4; i++) + { + int k, j; + const int tests[] = {0xffffff0a, 0xffff000b, 0xff00000c, 0x0000000d}; + err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &tests[i], i + 1); + ok(!err, "Test [%d] Expected 0, got %d\n", i, err); + err = getsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &k, &size); + ok(!err, "Test [%d] Expected 0, got %d\n", i, err); + j = i != 3 ? tests[i] & ((1 << (i + 1) * 8) - 1) : tests[i]; + ok(k == j, "Test [%d] Expected 0x%x, got 0x%x\n", i, j, k); + } + closesocket(s); + /* test SO_PROTOCOL_INFOA invalid parameters */ ok(getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), "getsockopt should have failed\n");

1 0

Bruno Jesus : ws2_32/tests: Add SO_BSP_STATE tests.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 14324fec97b8c9740dcbca59d44a5cba13b00323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14324fec97b8c9740dcbca59d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 4 23:52:08 2014 -0200 ws2_32/tests: Add SO_BSP_STATE tests. --- dlls/ws2_32/tests/sock.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 16f98c0..52a4e1e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1235,7 +1235,7 @@ static const LINGER linger_testvals[] = { static void test_set_getsockopt(void) { - SOCKET s; + SOCKET s, s2; int i, err, lasterr; int timeout; LINGER lingval; @@ -1252,6 +1252,11 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_STREAM, IPPROTO_TCP}, {AF_INET6, SOCK_DGRAM, IPPROTO_UDP} }; + union _csspace + { + CSADDR_INFO cs; + char space[128]; + } csinfoA, csinfoB; s = socket(AF_INET, SOCK_STREAM, 0); ok(s!=INVALID_SOCKET, "socket() failed error: %d\n", WSAGetLastError()); @@ -1462,6 +1467,99 @@ todo_wine closesocket(s); } + + /* Test SO_BSP_STATE - Present only in >= Win 2008 */ + s = socket(AF_INET, SOCK_STREAM, 0); + ok(s != INVALID_SOCKET, "Failed to create socket\n"); + s2 = socket(AF_INET, SOCK_STREAM, 0); + ok(s2 != INVALID_SOCKET, "Failed to create socket\n"); + + SetLastError(0xdeadbeef); + size = sizeof(csinfoA); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + if (!err) + { + struct sockaddr_in saddr; + memset(&saddr, 0, sizeof(saddr)); + saddr.sin_family = AF_INET; + saddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + + /* Socket is not bound, no information provided */ + ok(!csinfoA.cs.LocalAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); + ok(csinfoA.cs.LocalAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + /* Socket is not connected, no information provided */ + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + + err = bind(s, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(!err, "Expected 0, got %d\n", err); + size = sizeof(csinfoA); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(!err, "Expected 0, got %d\n", err); + + /* Socket is bound */ + ok(csinfoA.cs.LocalAddr.iSockaddrLength, "Expected non-zero\n"); + ok(csinfoA.cs.LocalAddr.lpSockaddr != NULL, "Expected non-null\n"); + /* Socket is not connected, no information provided */ + ok(!csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected 0, got %d\n", csinfoA.cs.LocalAddr.iSockaddrLength); + ok(csinfoA.cs.RemoteAddr.lpSockaddr == NULL, "Expected NULL, got %p\n", csinfoA.cs.LocalAddr.lpSockaddr); + + err = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(!err, "Expected 0, got %d\n", err); + err = getsockname(s2, (struct sockaddr *)&saddr, &size); + ok(!err, "Expected 0, got %d\n", err); + err = listen(s2, 1); + ok(!err, "Expected 0, got %d\n", err); + err = connect(s, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(!err, "Expected 0, got %d\n", err); + size = sizeof(saddr); + err = accept(s2, (struct sockaddr*)&saddr, &size); + ok(err != INVALID_SOCKET, "Failed to accept socket\n"); + closesocket(s2); + s2 = err; + + size = sizeof(csinfoA); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(!err, "Expected 0, got %d\n", err); + err = getsockopt(s2, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoB, &size); + ok(!err, "Expected 0, got %d\n", err); + ok(size == sizeof(csinfoA), "Got %d\n", size); + size = sizeof(saddr); + ok(size == csinfoA.cs.LocalAddr.iSockaddrLength, "Expected %d, got %d\n", size, + csinfoA.cs.LocalAddr.iSockaddrLength); + ok(size == csinfoA.cs.RemoteAddr.iSockaddrLength, "Expected %d, got %d\n", size, + csinfoA.cs.RemoteAddr.iSockaddrLength); + ok(!memcmp(csinfoA.cs.LocalAddr.lpSockaddr, csinfoB.cs.RemoteAddr.lpSockaddr, size), + "Expected matching addresses\n"); + ok(!memcmp(csinfoB.cs.LocalAddr.lpSockaddr, csinfoA.cs.RemoteAddr.lpSockaddr, size), + "Expected matching addresses\n"); + ok(csinfoA.cs.iSocketType == SOCK_STREAM, "Wrong socket type\n"); + ok(csinfoB.cs.iSocketType == SOCK_STREAM, "Wrong socket type\n"); + ok(csinfoA.cs.iProtocol == IPPROTO_TCP, "Wrong socket protocol\n"); + ok(csinfoB.cs.iProtocol == IPPROTO_TCP, "Wrong socket protocol\n"); + + err = getpeername(s, (struct sockaddr *)&saddr, &size); + ok(!err, "Expected 0, got %d\n", err); + ok(!memcmp(&saddr, csinfoA.cs.RemoteAddr.lpSockaddr, size), "Expected matching addresses\n"); + ok(!memcmp(&saddr, csinfoB.cs.LocalAddr.lpSockaddr, size), "Expected matching addresses\n"); + err = getpeername(s2, (struct sockaddr *)&saddr, &size); + ok(!err, "Expected 0, got %d\n", err); + ok(!memcmp(&saddr, csinfoB.cs.RemoteAddr.lpSockaddr, size), "Expected matching addresses\n"); + ok(!memcmp(&saddr, csinfoA.cs.LocalAddr.lpSockaddr, size), "Expected matching addresses\n"); + err = getsockname(s, (struct sockaddr *)&saddr, &size); + ok(!err, "Expected 0, got %d\n", err); + ok(!memcmp(&saddr, csinfoA.cs.LocalAddr.lpSockaddr, size), "Expected matching addresses\n"); + ok(!memcmp(&saddr, csinfoB.cs.RemoteAddr.lpSockaddr, size), "Expected matching addresses\n"); + err = getsockname(s2, (struct sockaddr *)&saddr, &size); + ok(!err, "Expected 0, got %d\n", err); + ok(!memcmp(&saddr, csinfoB.cs.LocalAddr.lpSockaddr, size), "Expected matching addresses\n"); + ok(!memcmp(&saddr, csinfoA.cs.RemoteAddr.lpSockaddr, size), "Expected matching addresses\n"); + } + else + ok(GetLastError() == WSAENOPROTOOPT, "Expected 10042, got %d\n", GetLastError()); + + closesocket(s); + closesocket(s2); } static void test_so_reuseaddr(void)

1 0

Stefan Leichter : kernel32: Add stubs for CreateSymbolicLinkA/W.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 9668dddfc93a5241121137d6a9ad89aa0009ac08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9668dddfc93a5241121137d6a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 2 21:35:06 2014 +0100 kernel32: Add stubs for CreateSymbolicLinkA/W. --- .../api-ms-win-core-file-l2-1-0.spec | 2 +- .../api-ms-win-core-file-l2-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/path.c | 18 ++++++++++++++++++ include/winbase.h | 3 +++ 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec index 914e0c0..3c1e59c 100644 --- a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec +++ b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec @@ -2,7 +2,7 @@ @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW @ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW @ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW -@ stub CreateSymbolicLinkW +@ stdcall CreateSymbolicLinkW(wstr wstr long) kernel32.CreateSymbolicLinkW @ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW diff --git a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec index 36cf6c3..6bfcb08 100644 --- a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec +++ b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec @@ -2,7 +2,7 @@ @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW @ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW @ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW -@ stub CreateSymbolicLinkW +@ stdcall CreateSymbolicLinkW(wstr wstr long) kernel32.CreateSymbolicLinkW @ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c072780..80c7a87 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -264,6 +264,8 @@ @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @ stdcall CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSocketHandle() +@ stdcall CreateSymbolicLinkA(str str long) +@ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) @ stdcall CreateTimerQueue () diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c4a37b2..bb167a0 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1954,3 +1954,21 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) nt_name.Buffer[1] = '\\'; return nt_name.Buffer; } + +/************************************************************************* + * CreateSymbolicLinkW (KERNEL32.@) + */ +BOOL WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) +{ + FIXME("(%s %s %d): stub\n", debugstr_w(link), debugstr_w(target), flags); + return TRUE; +} + +/************************************************************************* + * CreateSymbolicLinkA (KERNEL32.@) + */ +BOOL WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) +{ + FIXME("(%s %s %d): stub\n", debugstr_a(link), debugstr_a(target), flags); + return TRUE; +} diff --git a/include/winbase.h b/include/winbase.h index 723da26..5ac55b7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1684,6 +1684,9 @@ WINBASEAPI HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,L WINBASEAPI HANDLE WINAPI CreateSemaphoreExA(SECURITY_ATTRIBUTES*,LONG,LONG,LPCSTR,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateSemaphoreExW(SECURITY_ATTRIBUTES*,LONG,LONG,LPCWSTR,DWORD,DWORD); #define CreateSemaphoreEx WINELIB_NAME_AW(CreateSemaphoreEx) +WINBASEAPI BOOL WINAPI CreateSymbolicLinkA(LPCSTR,LPCSTR,DWORD); +WINBASEAPI BOOL WINAPI CreateSymbolicLinkW(LPCWSTR,LPCWSTR,DWORD); +#define CreateSymbolicLink WINELIB_NAME_AW(CreateSymbolicLink) WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateTimerQueue(void);

1 0

Michael Stefaniuc : jscript: Merge two if blocks with identical condition (PVS-Studio).
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 59af425d53e53a2e21ad3405b1b9c16f8a68a355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59af425d53e53a2e21ad3405b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 10:41:56 2014 +0100 jscript: Merge two if blocks with identical condition (PVS-Studio). --- dlls/jscript/array.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index c98f4fe..b28c54f 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -505,9 +505,7 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsign hres = set_length(jsthis, 0); if(FAILED(hres)) return hres; - } - if(!length) { if(r) *r = jsval_undefined(); return S_OK;

1 0

Michael Stefaniuc : comctl32: Merge two if blocks with identical condition (PVS-Studio).
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 2db0a3d01e21fc3f87d45eaca71f1b6d2ed7a94f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db0a3d01e21fc3f87d45eaca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 10:37:44 2014 +0100 comctl32: Merge two if blocks with identical condition (PVS-Studio). --- dlls/comctl32/listview.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bc748c6..57f19e4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4005,10 +4005,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN rect.top = rect.bottom = infoPtr->ptClickPos.y; InflateRect(&rect, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG)); - } - if (infoPtr->bLButtonDown) - { if (infoPtr->bMarqueeSelect) { POINT coords_orig;

1 0

Martin Storsjo : api-ms-win-core-errorhandling-l1-1-2: Add stub dll.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 7d2d96a736db8c599c0eb455bee8bcf76f11babc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2d96a736db8c599c0eb455b… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Dec 5 00:39:55 2014 +0200 api-ms-win-core-errorhandling-l1-1-2: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-errorhandling-l1-1-2/Makefile.in | 1 + .../api-ms-win-core-errorhandling-l1-1-2.spec | 13 +++++++++++++ tools/make_specfiles | 1 + 5 files changed, 18 insertions(+) diff --git a/configure b/configure index 6d94a08..0c8c692 100755 --- a/configure +++ b/configure @@ -859,6 +859,7 @@ enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 +enable_api_ms_win_core_errorhandling_l1_1_2 enable_api_ms_win_core_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_l1_2_0 @@ -16785,6 +16786,7 @@ wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_dateti wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 +wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-2 enable_api_ms_win_core_errorhandling_l1_1_2 wine_fn_config_dll api-ms-win-core-fibers-l1-1-0 enable_api_ms_win_core_fibers_l1_1_0 wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 diff --git a/configure.ac b/configure.ac index 863f5e7..87ce48c 100644 --- a/configure.ac +++ b/configure.ac @@ -2651,6 +2651,7 @@ WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) diff --git a/dlls/api-ms-win-core-errorhandling-l1-1-2/Makefile.in b/dlls/api-ms-win-core-errorhandling-l1-1-2/Makefile.in new file mode 100644 index 0000000..096f900 --- /dev/null +++ b/dlls/api-ms-win-core-errorhandling-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-errorhandling-l1-1-2.dll diff --git a/dlls/api-ms-win-core-errorhandling-l1-1-2/api-ms-win-core-errorhandling-l1-1-2.spec b/dlls/api-ms-win-core-errorhandling-l1-1-2/api-ms-win-core-errorhandling-l1-1-2.spec new file mode 100644 index 0000000..d334d6d --- /dev/null +++ b/dlls/api-ms-win-core-errorhandling-l1-1-2/api-ms-win-core-errorhandling-l1-1-2.spec @@ -0,0 +1,13 @@ +@ stdcall AddVectoredContinueHandler(long ptr) kernel32.AddVectoredContinueHandler +@ stdcall AddVectoredExceptionHandler(long ptr) kernel32.AddVectoredExceptionHandler +@ stdcall GetErrorMode() kernel32.GetErrorMode +@ stdcall GetLastError() kernel32.GetLastError +@ stdcall RaiseException(long long long ptr) kernel32.RaiseException +@ stub RaiseFailFastException +@ stdcall RemoveVectoredContinueHandler(ptr) kernel32.RemoveVectoredContinueHandler +@ stdcall RemoveVectoredExceptionHandler(ptr) kernel32.RemoveVectoredExceptionHandler +@ stdcall RestoreLastError(long) kernel32.RestoreLastError +@ stdcall SetErrorMode(long) kernel32.SetErrorMode +@ stdcall SetLastError(long) kernel32.SetLastError +@ stdcall SetUnhandledExceptionFilter(ptr) kernel32.SetUnhandledExceptionFilter +@ stdcall UnhandledExceptionFilter(ptr) kernel32.UnhandledExceptionFilter diff --git a/tools/make_specfiles b/tools/make_specfiles index 7ef15d6..2ed820f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -166,6 +166,7 @@ my @dll_groups = "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", "api-ms-win-core-xstate-l2-1-0", + "api-ms-win-core-errorhandling-l1-1-2", ], [ "ole32",

1 0

Vincent Povirk : wbemprox: Implement Win32_OperatingSystem:: TotalVisibleMemorySize.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 192e1c0e7ff1cb838bdf2e111fd4e97a42ee4a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=192e1c0e7ff1cb838bdf2e111… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 4 15:32:35 2014 -0600 wbemprox: Implement Win32_OperatingSystem::TotalVisibleMemorySize. --- dlls/wbemprox/builtin.c | 85 ++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 48ed20a..6337fef 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -271,6 +271,8 @@ static const WCHAR prop_threadcountW[] = {'T','h','r','e','a','d','C','o','u','n','t',0}; static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; +static const WCHAR prop_totalvisiblememorysizeW[] = + {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; static const WCHAR prop_uniqueidW[] = @@ -387,26 +389,27 @@ static const struct column col_networkadapterconfig[] = }; static const struct column col_os[] = { - { prop_buildnumberW, CIM_STRING }, - { prop_captionW, CIM_STRING }, - { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_csdversionW, CIM_STRING }, - { prop_installdateW, CIM_DATETIME }, - { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, - { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, - { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_nameW, CIM_STRING }, - { prop_osarchitectureW, CIM_STRING }, - { prop_oslanguageW, CIM_UINT32, VT_I4 }, - { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, - { prop_ostypeW, CIM_UINT16, VT_I4 }, - { prop_serialnumberW, CIM_STRING }, - { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, - { prop_servicepackminorW, CIM_UINT16, VT_I4 }, - { prop_suitemaskW, CIM_UINT32, VT_I4 }, - { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_versionW, CIM_STRING } + { prop_buildnumberW, CIM_STRING }, + { prop_captionW, CIM_STRING }, + { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_csdversionW, CIM_STRING }, + { prop_installdateW, CIM_DATETIME }, + { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, + { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, + { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING }, + { prop_osarchitectureW, CIM_STRING }, + { prop_oslanguageW, CIM_UINT32, VT_I4 }, + { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, + { prop_ostypeW, CIM_UINT16, VT_I4 }, + { prop_serialnumberW, CIM_STRING }, + { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, + { prop_servicepackminorW, CIM_UINT16, VT_I4 }, + { prop_suitemaskW, CIM_UINT32, VT_I4 }, + { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_totalvisiblememorysizeW, CIM_UINT64 }, + { prop_versionW, CIM_STRING } }; static const struct column col_param[] = { @@ -718,6 +721,7 @@ struct record_operatingsystem UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + UINT64 totalvisiblememorysize; const WCHAR *version; }; struct record_param @@ -2147,26 +2151,27 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_operatingsystem *)table->data; - rec->buildnumber = os_buildnumberW; - rec->caption = os_captionW; - rec->codeset = get_codeset(); - rec->countrycode = get_countrycode(); - rec->csdversion = os_csdversionW; - rec->installdate = os_installdateW; - rec->lastbootuptime = get_lastbootuptime(); - rec->localdatetime = get_localdatetime(); - rec->locale = get_locale(); - rec->name = os_nameW; - rec->osarchitecture = get_osarchitecture(); - rec->oslanguage = GetSystemDefaultLangID(); - rec->osproductsuite = 2461140; /* Windows XP Professional */ - rec->ostype = 18; /* WINNT */ - rec->serialnumber = os_serialnumberW; - rec->servicepackmajor = 3; - rec->servicepackminor = 0; - rec->suitemask = 272; /* Single User + Terminal */ - rec->systemdirectory = get_systemdirectory(); - rec->version = os_versionW; + rec->buildnumber = os_buildnumberW; + rec->caption = os_captionW; + rec->codeset = get_codeset(); + rec->countrycode = get_countrycode(); + rec->csdversion = os_csdversionW; + rec->installdate = os_installdateW; + rec->lastbootuptime = get_lastbootuptime(); + rec->localdatetime = get_localdatetime(); + rec->locale = get_locale(); + rec->name = os_nameW; + rec->osarchitecture = get_osarchitecture(); + rec->oslanguage = GetSystemDefaultLangID(); + rec->osproductsuite = 2461140; /* Windows XP Professional */ + rec->ostype = 18; /* WINNT */ + rec->serialnumber = os_serialnumberW; + rec->servicepackmajor = 3; + rec->servicepackminor = 0; + rec->suitemask = 272; /* Single User + Terminal */ + rec->systemdirectory = get_systemdirectory(); + rec->totalvisiblememorysize = get_total_physical_memory() / 1024; + rec->version = os_versionW; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++;

1 0

Mark Harmstone : winealsa: Implement GetPropValue and return device path.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: a73669aed8d21fa68cef46ec75062ca4dcdcab07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73669aed8d21fa68cef46ec7… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Dec 4 17:59:20 2014 +0000 winealsa: Implement GetPropValue and return device path. --- dlls/winealsa.drv/mmdevdrv.c | 108 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/winealsa.drv.spec | 1 + 2 files changed, 109 insertions(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5ad72f9..827cdd8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -3823,3 +3823,111 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, return S_OK; } + +enum AudioDeviceConnectionType { + AudioDeviceConnectionType_Unknown = 0, + AudioDeviceConnectionType_PCI, + AudioDeviceConnectionType_USB +}; + +HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) +{ + static const PROPERTYKEY devicepath_key = { /* undocumented? - {b3f8fa53-0004-438e-9003-51a46e139bfc},2 */ + {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 + }; + + TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + + if(IsEqualPropertyKey(*prop, devicepath_key)) + { + char name[256], uevent[MAX_PATH]; + EDataFlow flow; + FILE *fuevent; + int card, device; + + if(!get_alsa_name_by_guid(guid, name, sizeof(name), &flow)) + { + WARN("Unknown interface %s\n", debugstr_guid(guid)); + return E_NOINTERFACE; + } + + /* only implemented for identifiable devices, i.e. not "default" */ + if(!sscanf(name, "plughw:%u,%u", &card, &device)) + return E_NOTIMPL; + + sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card); + fuevent = fopen(uevent, "r"); + + if(fuevent){ + enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown; + USHORT vendor_id = 0, product_id = 0; + char line[256]; + + while (fgets(line, sizeof(line), fuevent)) { + char *val; + size_t val_len; + + if((val = strchr(line, '='))) { + val[0] = 0; + val++; + + val_len = strlen(val); + if(val_len > 0 && val[val_len - 1] == '\n') { val[val_len - 1] = 0; } + + if(!strcmp(line, "PCI_ID")){ + connection = AudioDeviceConnectionType_PCI; + if(sscanf(val, "%hX:%hX", &vendor_id, &product_id)<2){ + WARN("Unexpected input when reading PCI_ID in uevent file.\n"); + connection = AudioDeviceConnectionType_Unknown; + break; + } + }else if(!strcmp(line, "DEVTYPE") && !strcmp(val,"usb_interface")) + connection = AudioDeviceConnectionType_USB; + else if(!strcmp(line, "PRODUCT")) + if(sscanf(val, "%hx/%hx/", &vendor_id, &product_id)<2){ + WARN("Unexpected input when reading PRODUCT in uevent file.\n"); + connection = AudioDeviceConnectionType_Unknown; + break; + } + } + } + + fclose(fuevent); + + if(connection == AudioDeviceConnectionType_USB || connection == AudioDeviceConnectionType_PCI){ + static const WCHAR usbformatW[] = { '{','1','}','.','U','S','B','\\','V','I','D','_', + '%','0','4','X','&','P','I','D','_','%','0','4','X','\\', + '%','u','&','%','0','8','X',0 }; /* "{1}.USB\VID_%04X&PID_%04X\%u&%08X" */ + static const WCHAR pciformatW[] = { '{','1','}','.','H','D','A','U','D','I','O','\\','F','U','N','C','_','0','1','&', + 'V','E','N','_','%','0','4','X','&','D','E','V','_', + '%','0','4','X','\\','%','u','&','%','0','8','X',0 }; /* "{1}.HDAUDIO\FUNC_01&VEN_%04X&DEV_%04X\%u&%08X" */ + UINT serial_number; + + /* As hardly any audio devices have serial numbers, Windows instead + appears to use a persistent random number. We emulate this here + by instead using the last 8 hex digits of the GUID. */ + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; + + out->vt = VT_LPWSTR; + out->u.pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR)); + + if(!out->u.pwszVal) + return E_OUTOFMEMORY; + + if(connection == AudioDeviceConnectionType_USB) + sprintfW( out->u.pwszVal, usbformatW, vendor_id, product_id, device, serial_number); + else if(connection == AudioDeviceConnectionType_PCI) + sprintfW( out->u.pwszVal, pciformatW, vendor_id, product_id, device, serial_number); + + return S_OK; + } + }else{ + WARN("Could not open %s for reading\n", uevent); + return E_NOTIMPL; + } + } + + TRACE("Unimplemented property %s,%u\n", wine_dbgstr_guid(&prop->fmtid), prop->pid); + + return E_NOTIMPL; +} diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index 04fa05a..bd83ea2 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -8,3 +8,4 @@ @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager +@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue

1 0

Mark Harmstone : mmdevapi: Allow GetPropValue function in audio drivers.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: b1ff68b8036cd30291de7c21628ac89a81f3ed8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ff68b8036cd30291de7c216… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Dec 4 17:58:58 2014 +0000 mmdevapi: Allow GetPropValue function in audio drivers. --- dlls/mmdevapi/devenum.c | 33 +++++++++++++++++++++++++++++++++ dlls/mmdevapi/main.c | 3 +++ dlls/mmdevapi/mmdevapi.h | 2 ++ 3 files changed, 38 insertions(+) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index e2a7cc5..56f770a 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -264,6 +264,25 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT return hr; } +static HRESULT set_driver_prop_value(GUID *id, const EDataFlow flow, const PROPERTYKEY *prop) +{ + HRESULT hr; + PROPVARIANT pv; + + if (!drvs.pGetPropValue) + return E_NOTIMPL; + + hr = drvs.pGetPropValue(id, prop, &pv); + + if (SUCCEEDED(hr)) + { + MMDevice_SetPropValue(id, flow, prop, &pv); + PropVariantClear(&pv); + } + + return hr; +} + /* Creates or updates the state of a device * If GUID is null, a random guid will be assigned * and the device will be created @@ -279,6 +298,10 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 }; + static const PROPERTYKEY devicepath_key = { + {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 + }; + for (i = 0; i < MMDevice_count; ++i) { MMDevice *device = MMDevice_head[i]; @@ -338,6 +361,16 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.u.pwszVal = guidstr; MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); + set_driver_prop_value(id, flow, &devicepath_key); + + if (FAILED(set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_FormFactor))) + { + pv.vt = VT_UI4; + pv.u.ulVal = (flow == eCapture) ? Microphone : Speakers; + + MMDevice_SetPropValue(id, flow, &PKEY_AudioEndpoint_FormFactor, &pv); + } + RegCloseKey(keyprop); } RegCloseKey(key); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 447813f..52cf6f1 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -97,6 +97,9 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) LDFC(GetAudioSessionManager); #undef LDFC + /* optional - do not fail if not found */ + driver->pGetPropValue = (void*)GetProcAddress(driver->module, "GetPropValue"); + driver->priority = driver->pGetPriority(); lstrcpyW(driver->module_name, driver_module); diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 2a04780..2b40a05 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -54,6 +54,8 @@ typedef struct _DriverFuncs { IAudioClient **out); HRESULT (WINAPI *pGetAudioSessionManager)(IMMDevice *device, IAudioSessionManager2 **out); + HRESULT (WINAPI *pGetPropValue)(GUID *guid, + const PROPERTYKEY *prop, PROPVARIANT *out); } DriverFuncs; extern DriverFuncs drvs DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Call CreateProcess with CREATE_UNICODE_ENVIRONMENT flag in exec functions family.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: a4fcba60b9a8084e8a579e503a83c5241f437135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fcba60b9a8084e8a579e503… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 4 11:41:30 2014 +0100 msvcrt: Call CreateProcess with CREATE_UNICODE_ENVIRONMENT flag in exec functions family. Based on a patch by Ron Yorston. --- dlls/msvcrt/process.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b782727..f3c9000 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -134,6 +134,7 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const MSVCRT_wchar_t* exe, MSVCRT STARTUPINFOW si; PROCESS_INFORMATION pi; MSVCRT_wchar_t fullname[MAX_PATH]; + DWORD create_flags = CREATE_UNICODE_ENVIRONMENT; TRACE("%x %s %s %s %d\n", flags, debugstr_w(exe), debugstr_w(cmdline), debugstr_w(env), use_path); @@ -148,9 +149,9 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const MSVCRT_wchar_t* exe, MSVCRT memset(&si, 0, sizeof(si)); si.cb = sizeof(si); msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2); + if (flags == MSVCRT__P_DETACH) create_flags |= DETACHED_PROCESS; if (!CreateProcessW(fullname, cmdline, NULL, NULL, TRUE, - flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, - env, NULL, &si, &pi)) + create_flags, env, NULL, &si, &pi)) { msvcrt_set_errno(GetLastError()); MSVCRT_free(si.lpReserved2);

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
32
Older →

Jump to page:

2025

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-commits December 2014