October 2015 - Wine-commits

Erich E. Hoover : ws2_32: Check for invalid parameters in TransmitFile.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 109d4b914ab8649fcd90c2623e45feb86be133ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=109d4b914ab8649fcd90c2623… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jan 17 12:35:57 2014 -0700 ws2_32: Check for invalid parameters in TransmitFile. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> --- dlls/ws2_32/socket.c | 21 ++++++++++ dlls/ws2_32/tests/sock.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4edb579..44926de 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2731,8 +2731,29 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers, DWORD flags ) { + union generic_unix_sockaddr uaddr; + unsigned int uaddrlen = sizeof(uaddr); + int fd; + FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped, buffers, flags ); + + fd = get_sock_fd( s, 0, NULL ); + if (fd == -1) + { + WSASetLastError( WSAENOTSOCK ); + return FALSE; + } + if (getpeername( fd, &uaddr.addr, &uaddrlen ) != 0) + { + release_sock_fd( s, fd ); + WSASetLastError( WSAENOTCONN ); + return FALSE; + } + release_sock_fd( s, fd ); + if (flags) + FIXME("Flags are not currently supported (0x%x).\n", flags); + WSASetLastError( WSAEOPNOTSUPP ); return FALSE; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7574631..a8ee3ce 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7425,6 +7425,108 @@ end: closesocket(connector2); } +static void test_TransmitFile(void) +{ + GUID transmitFileGuid = WSAID_TRANSMITFILE; + LPFN_TRANSMITFILE pTransmitFile = NULL; + HANDLE file = INVALID_HANDLE_VALUE; + char system_ini_path[MAX_PATH]; + struct sockaddr_in bindAddress; + SOCKET client, server, dest; + DWORD num_bytes, err; + int iret, len; + BOOL bret; + + /* Setup sockets for testing TransmitFile */ + client = socket(AF_INET, SOCK_STREAM, 0); + server = socket(AF_INET, SOCK_STREAM, 0); + if (client == INVALID_SOCKET || server == INVALID_SOCKET) + { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto cleanup; + } + iret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &transmitFileGuid, sizeof(transmitFileGuid), + &pTransmitFile, sizeof(pTransmitFile), &num_bytes, NULL, NULL); + if (iret) + { + skip("WSAIoctl failed to get TransmitFile with ret %d + errno %d\n", iret, WSAGetLastError()); + goto cleanup; + } + GetSystemWindowsDirectoryA(system_ini_path, MAX_PATH ); + strcat(system_ini_path, "\\system.ini"); + file = CreateFileA(system_ini_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0x0, NULL); + if (file == INVALID_HANDLE_VALUE) + { + skip("Unable to open a file to transmit.\n"); + goto cleanup; + } + + /* Test TransmitFile with an invalid socket */ + bret = pTransmitFile(INVALID_SOCKET, file, 0, 0, NULL, NULL, 0); + err = WSAGetLastError(); + ok(!bret, "TransmitFile succeeded unexpectedly.\n"); + ok(err == WSAENOTSOCK, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTSOCK); + + /* Test a bogus TransmitFile without a connected socket */ + bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, TF_REUSE_SOCKET); + err = WSAGetLastError(); + ok(!bret, "TransmitFile succeeded unexpectedly.\n"); + ok(err == WSAENOTCONN, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTCONN); + + /* Setup a properly connected socket for transfers */ + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_port = htons(9375); + bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(server, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + if (iret != 0) + { + skip("failed to bind(), error %d\n", WSAGetLastError()); + goto cleanup; + } + iret = listen(server, 1); + if (iret != 0) + { + skip("failed to listen(), error %d\n", WSAGetLastError()); + goto cleanup; + } + iret = connect(client, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + if (iret != 0) + { + skip("failed to connect(), error %d\n", WSAGetLastError()); + goto cleanup; + } + len = sizeof(bindAddress); + dest = accept(server, (struct sockaddr*)&bindAddress, &len); + if (dest == INVALID_SOCKET) + { + skip("failed to accept(), error %d\n", WSAGetLastError()); + goto cleanup; + } + if (set_blocking(dest, FALSE)) + { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto cleanup; + } + + /* Test TransmitFile with no possible buffer */ + bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0); + todo_wine ok(bret, "TransmitFile failed unexpectedly.\n"); + + /* Test TransmitFile with a UDP datagram socket */ + closesocket(client); + client = socket(AF_INET, SOCK_DGRAM, 0); + bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0); + err = WSAGetLastError(); + ok(!bret, "TransmitFile succeeded unexpectedly.\n"); + ok(err == WSAENOTCONN, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTCONN); + +cleanup: + CloseHandle(file); + closesocket(client); + closesocket(server); +} + static void test_getpeername(void) { SOCKET sock; @@ -8793,6 +8895,7 @@ START_TEST( sock ) test_events(1); test_ipv6only(); + test_TransmitFile(); test_GetAddrInfoW(); test_getaddrinfo(); test_AcceptEx();

1 0

Joachim Priesner : user32: Hide horizontal Listbox scroll bar if no horizontal extent is set.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 175e714656a8a7c0552e2a7627b107f4d665f584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175e714656a8a7c0552e2a762… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Sep 28 11:20:45 2015 +0200 user32: Hide horizontal Listbox scroll bar if no horizontal extent is set. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> --- dlls/user32/listbox.c | 18 +++++++- dlls/user32/tests/listbox.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 2902ac9..cf065e4 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -265,7 +265,7 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) if (descr->style & WS_VSCROLL) SetScrollInfo( descr->self, SB_VERT, &info, TRUE ); - if (descr->style & WS_HSCROLL) + if ((descr->style & WS_HSCROLL) && descr->horz_extent) { info.nPos = descr->horz_pos; info.nPage = descr->width; @@ -274,6 +274,20 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) info.fMask |= SIF_DISABLENOSCROLL; SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); } + else + { + if (descr->style & LBS_DISABLENOSCROLL) + { + info.nMin = 0; + info.nMax = 0; + info.fMask = SIF_RANGE | SIF_DISABLENOSCROLL; + SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); + } + else + { + ShowScrollBar( descr->self, SB_HORZ, FALSE ); + } + } } } @@ -1248,6 +1262,8 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) info.nMin = 0; info.nMax = descr->horz_extent ? descr->horz_extent - 1 : 0; info.fMask = SIF_RANGE; + if (descr->style & LBS_DISABLENOSCROLL) + info.fMask |= SIF_DISABLENOSCROLL; SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); } if (descr->horz_pos > extent - descr->width) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 79d18e7..9380457 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1665,7 +1665,10 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + /* horizontal extent < width */ SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); @@ -1677,6 +1680,23 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); DestroyWindow(listbox); @@ -1692,7 +1712,71 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent < width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + DestroyWindow(listbox); + + + listbox = create_listbox(WS_CHILD | WS_VISIBLE | WS_HSCROLL | LBS_DISABLENOSCROLL, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + /* horizontal extent < width */ SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); @@ -1704,6 +1788,23 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); @@ -1716,6 +1817,8 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); DestroyWindow(listbox);

1 0

Charles Davis : kernel32/tests: Use a volatile pointer to cause a crash in the debugger tests. (Clang).
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 3eb8e325b8cc3bb56472c3456cec29877b30c67b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb8e325b8cc3bb56472c3456… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Sep 22 16:12:05 2015 -0600 kernel32/tests: Use a volatile pointer to cause a crash in the debugger tests. (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index a802784..326a903 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -158,7 +158,7 @@ typedef struct static void doCrash(int argc, char** argv) { - char* p; + volatile char* p; /* make sure the exception gets to the debugger */ SetErrorMode( 0 );

1 0

Charles Davis : configure: Try harder to disable Fortify.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 5252d19fbaa5c504dd6502f01736afa8fe62c068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5252d19fbaa5c504dd6502f01… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Sep 22 15:57:00 2015 -0600 configure: Try harder to disable Fortify. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 33f0343..b4bbb2f 100755 --- a/configure +++ b/configure @@ -14550,7 +14550,7 @@ else int main () { -#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +#if (defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0) || (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0) #error Fortify enabled #endif ; diff --git a/configure.ac b/configure.ac index 74ab202..ce631e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1898,7 +1898,7 @@ dnl **** Disable Fortify, it has too many false positives AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], -[[#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +[[#if (defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0) || (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0) #error Fortify enabled #endif]])], [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes]))

1 0

Sebastian Lackner : wbemprox/tests: Add tests for Win32_Bios table.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 08acac5f9153f290ae802d7e0264dc8c6126458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08acac5f9153f290ae802d7e0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 14:20:18 2015 +0200 wbemprox/tests: Add tests for Win32_Bios table. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 09c8734..98550d5 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -243,6 +243,114 @@ out: SysFreeString( class ); } +static void test_Win32_Bios( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'B','i','o','s',0}; + static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR identificationcodeW[] = {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; + static const WCHAR serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; + static const WCHAR smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; + static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + CIMTYPE type; + ULONG count; + VARIANT val; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, descriptionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get description %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "description: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, identificationcodeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get identication code %08x\n", hr ); + todo_wine + ok( V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, manufacturerW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get manufacturer %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "manufacturer: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); + todo_wine + ok( hr == S_OK, "failed to get name %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + } + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, releasedateW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get release date %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_DATETIME, "unexpected type 0x%x\n", type ); + trace( "release date: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, serialnumberW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get serial number %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL /* Testbot VMs */, + "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, smbiosbiosversionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get bios version %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "bios version: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, versionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get version %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "version: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_Process( IWbemServices *services ) { static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; @@ -945,6 +1053,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_select( services ); + test_Win32_Bios( services ); test_Win32_Process( services ); test_Win32_Service( services ); test_Win32_ComputerSystem( services );

1 0

Michael Müller : wbemprox: Add bios name column in Win32_BIOS.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 20ff3352eb19292d47eaa8f3aecc61523ac1f1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ff3352eb19292d47eaa8f3a… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Oct 7 14:20:25 2015 +0200 wbemprox: Add bios name column in Win32_BIOS. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 6 +++++- dlls/wbemprox/tests/query.c | 12 ++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1c960eb..2ff3f50 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -374,6 +374,7 @@ static const struct column col_bios[] = { prop_descriptionW, CIM_STRING }, { prop_identificationcodeW, CIM_STRING }, { prop_manufacturerW, CIM_STRING }, + { prop_nameW, CIM_STRING }, { prop_releasedateW, CIM_DATETIME }, { prop_serialnumberW, CIM_STRING }, { prop_smbiosbiosversionW, CIM_STRING }, @@ -658,6 +659,8 @@ static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; static const WCHAR bios_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; +static const WCHAR bios_nameW[] = + {'W','I','N','E',' ','B','I','O','S',0}; static const WCHAR bios_releasedateW[] = {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = @@ -761,6 +764,7 @@ struct record_bios const WCHAR *description; const WCHAR *identificationcode; const WCHAR *manufacturer; + const WCHAR *name; const WCHAR *releasedate; const WCHAR *serialnumber; const WCHAR *smbiosbiosversion; @@ -1040,7 +1044,7 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, + { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } }; static const struct record_computersystemproduct data_compsysproduct[] = diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 98550d5..3138c7a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -299,15 +299,11 @@ static void test_Win32_Bios( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); - todo_wine ok( hr == S_OK, "failed to get name %08x\n", hr ); - if (hr == S_OK) - { - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - } + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); type = 0xdeadbeef; VariantInit( &val );

1 0

Aric Stewart : hidclass.sys: Help make the logic around feature input flags more apparent.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 2183b8ac2153912a0d30d7ca3942dea7a55d4554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2183b8ac2153912a0d30d7ca3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 6 16:20:51 2015 -0500 hidclass.sys: Help make the logic around feature input flags more apparent. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 65 +++++++++++++----------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 35057f1..ac9b047 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -33,16 +33,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); #define USAGE_MAX 10 +/* Flags that are defined in the document + "Device Class Definition for Human Interface Devices" */ enum { - INPUT_DATA = 0x01, - INPUT_ARRAY = 0x02, - INPUT_ABS = 0x04, - INPUT_WRAP = 0x08, - INPUT_LINEAR = 0x10, - INPUT_PREFSTATE = 0x20, - INPUT_NULL = 0x40, - INPUT_VOLATILE = 0x80, - INPUT_BITFIELD = 0x100 + INPUT_DATA_CONST = 0x01, /* Data (0) | Constant (1) */ + INPUT_ARRAY_VAR = 0x02, /* Array (0) | Variable (1) */ + INPUT_ABS_REL = 0x04, /* Absolute (0) | Relative (1) */ + INPUT_WRAP = 0x08, /* No Wrap (0) | Wrap (1) */ + INPUT_LINEAR = 0x10, /* Linear (0) | Non Linear (1) */ + INPUT_PREFSTATE = 0x20, /* Preferred State (0) | No Preferred (1) */ + INPUT_NULL = 0x40, /* No Null position (0) | Null state(1) */ + INPUT_VOLATILE = 0x80, /* Non Volatile (0) | Volatile (1) */ + INPUT_BITFIELD = 0x100 /* Bit Field (0) | Buffered Bytes (1) */ }; enum { @@ -407,48 +409,21 @@ void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *f } else { - if ((itemVal & INPUT_DATA) == 0) - feature->isData = TRUE; - else - feature->isData = FALSE; /* Const */ - if ((itemVal & INPUT_ARRAY) == 0) - feature->isArray= TRUE; - else - feature->isArray= FALSE; /* Var */ - if ((itemVal & INPUT_ABS) == 0) - feature->IsAbsolute = TRUE; - else - feature->IsAbsolute = FALSE; /* Rel */ - if ((itemVal & INPUT_WRAP) == 0) - feature->Wrap = FALSE; - else - feature->Wrap = TRUE; - if ((itemVal & INPUT_LINEAR) == 0) - feature->Linear = TRUE; - else - feature->Linear = FALSE; - if ((itemVal & INPUT_PREFSTATE) == 0) - feature->prefState = TRUE; - else - feature->prefState = FALSE; - if ((itemVal & INPUT_NULL) == 0) - feature->HasNull = FALSE; - else - feature->HasNull = TRUE; + feature->isData = ((itemVal & INPUT_DATA_CONST) == 0); + feature->isArray = ((itemVal & INPUT_ARRAY_VAR) == 0); + feature->IsAbsolute = ((itemVal & INPUT_ABS_REL) == 0); + feature->Wrap = ((itemVal & INPUT_WRAP) != 0); + feature->Linear = ((itemVal & INPUT_LINEAR) == 0); + feature->prefState = ((itemVal & INPUT_PREFSTATE) == 0); + feature->HasNull = ((itemVal & INPUT_NULL) != 0); if (bTag != TAG_MAIN_INPUT) { - if ((itemVal & INPUT_VOLATILE) == 0) - feature->Volatile = FALSE; - else - feature->Volatile = TRUE; + feature->Volatile = ((itemVal & INPUT_VOLATILE) != 0); } if (bSize > 1) { - if ((itemVal & INPUT_BITFIELD) == 0) - feature->BitField = TRUE; - else - feature->BitField = FALSE; /* Buffered Bytes */ + feature->BitField = ((itemVal & INPUT_BITFIELD) == 0); } feature->index = *feature_index; *feature_index = *feature_index + 1;

1 0

Aric Stewart : hidclass.sys: Make sure we pass in the index not a pointer to the index.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 76d8b4ca02ff39e766b6a87abbaaa1e17f0aa63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d8b4ca02ff39e766b6a87ab… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 6 16:22:23 2015 -0500 hidclass.sys: Make sure we pass in the index not a pointer to the index. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 46bd010..b0982f0 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -233,13 +233,15 @@ static NTSTATUS handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR(IRP *irp, BASE_DEVICE return STATUS_SUCCESS; } -static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, DWORD index) +static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, SHORT index) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); WCHAR buffer[127]; NTSTATUS status; + ULONG InputBuffer; - status = call_minidriver(IOCTL_HID_GET_STRING, device, &index, sizeof(index), buffer, sizeof(buffer)); + InputBuffer = MAKELONG(index, 0); + status = call_minidriver(IOCTL_HID_GET_STRING, device, ULongToPtr(InputBuffer), sizeof(InputBuffer), buffer, sizeof(buffer)); if (status == STATUS_SUCCESS) {

1 0

Sebastian Lackner : ntdll/tests: Fix test failures on Windows 10.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 53c8345c6dc8e8ac013790a7268a0e3f87a15290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c8345c6dc8e8ac013790a72… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 01:23:27 2015 +0200 ntdll/tests: Fix test failures on Windows 10. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/threadpool.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 7be3f0d..9197660 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -867,6 +867,7 @@ static void test_tp_window_length(void) NTSTATUS status; TP_POOL *pool; DWORD result; + BOOL merged; semaphore = CreateSemaphoreA(NULL, 0, 2, NULL); ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); @@ -929,8 +930,8 @@ static void test_tp_window_length(void) result = WaitForSingleObject(semaphore, 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); - ok(info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50, - "expected that timers are merged\n"); + merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50; + ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n"); /* on Windows the timers also get merged in this case */ info1.ticks = 0; @@ -948,9 +949,9 @@ static void test_tp_window_length(void) result = WaitForSingleObject(semaphore, 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); + merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50; todo_wine - ok(info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50, - "expected that timers are merged\n"); + ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n"); /* cleanup */ pTpReleaseTimer(timer1);

1 0

Sebastian Lackner : ntdll/tests: Limit number of pool threads to avoid random test failures.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: f97a18f8c033a4c4080e5a7aae5b28b3a41079b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97a18f8c033a4c4080e5a7aa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 01:23:54 2015 +0200 ntdll/tests: Limit number of pool threads to avoid random test failures. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/threadpool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 9197660..a262ecb 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -228,6 +228,7 @@ static void test_tp_simple(void) /* test cancellation of pending simple callbacks */ userdata = 0; + pTpSetPoolMaxThreads(pool, 10); memset(&environment, 0, sizeof(environment)); environment.Version = 1; environment.Pool = pool;

1 0