December 2014 - Wine-commits

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

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

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

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

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

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

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

Nikolay Sivov : shell32: Added a stub for SHAssocEnumHandlers().
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 717385b0ba2cc63410e06805c50d857220522e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717385b0ba2cc63410e06805c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 5 13:30:08 2014 +0300 shell32: Added a stub for SHAssocEnumHandlers(). --- dlls/shell32/assoc.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 91 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index b0d815a..39e210d 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -77,6 +77,17 @@ static inline IQueryAssociationsImpl *impl_from_IQueryAssociations(IQueryAssocia return CONTAINING_RECORD(iface, IQueryAssociationsImpl, IQueryAssociations_iface); } +struct enumassochandlers +{ + IEnumAssocHandlers IEnumAssocHandlers_iface; + LONG ref; +}; + +static inline struct enumassochandlers *impl_from_IEnumAssocHandlers(IEnumAssocHandlers *iface) +{ + return CONTAINING_RECORD(iface, struct enumassochandlers, IEnumAssocHandlers_iface); +} + /************************************************************************** * IQueryAssociations_QueryInterface * @@ -965,3 +976,82 @@ HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, R TRACE("returning 0x%x with %p\n", hr, *ppv); return hr; } + +static HRESULT WINAPI enumassochandlers_QueryInterface(IEnumAssocHandlers *iface, REFIID riid, void **obj) +{ + struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); + + TRACE("(%p %s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IEnumAssocHandlers) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IEnumAssocHandlers_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI enumassochandlers_AddRef(IEnumAssocHandlers *iface) +{ + struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI enumassochandlers_Release(IEnumAssocHandlers *iface) +{ + struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (!ref) + SHFree(This); + + return ref; +} + +static HRESULT WINAPI enumassochandlers_Next(IEnumAssocHandlers *iface, ULONG count, IAssocHandler **handlers, + ULONG *fetched) +{ + struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); + + FIXME("(%p)->(%u %p %p): stub\n", This, count, handlers, fetched); + + return E_NOTIMPL; +} + +static const IEnumAssocHandlersVtbl enumassochandlersvtbl = { + enumassochandlers_QueryInterface, + enumassochandlers_AddRef, + enumassochandlers_Release, + enumassochandlers_Next +}; + +/************************************************************************** + * SHAssocEnumHandlers [SHELL32.@] + */ +HRESULT WINAPI SHAssocEnumHandlers(const WCHAR *extra, ASSOC_FILTER filter, IEnumAssocHandlers **enumhandlers) +{ + struct enumassochandlers *enumassoc; + + FIXME("(%s %d %p\n): stub", debugstr_w(extra), filter, enumhandlers); + + *enumhandlers = NULL; + + enumassoc = SHAlloc(sizeof(*enumassoc)); + if (!enumassoc) + return E_OUTOFMEMORY; + + enumassoc->IEnumAssocHandlers_iface.lpVtbl = &enumassochandlersvtbl; + enumassoc->ref = 1; + + *enumhandlers = &enumassoc->IEnumAssocHandlers_iface; + return S_OK; +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index e6858c8..0a8d448 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -328,6 +328,7 @@ @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) +@ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr)

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: ea932fbcc15951a13a12cfca8949597ebd9d6fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea932fbcc15951a13a12cfca8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 5 12:21:02 2014 +0100 Assorted spelling fixes. --- dlls/dwrite/tests/font.c | 2 +- dlls/kernel32/tests/virtual.c | 4 ++-- dlls/user32/tests/input.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2fe845c..49e7154 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1513,7 +1513,7 @@ static void test_CustomFontCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(idfont2, 1); EXPECT_REF(idfont, 1); - ok(idfont2 != idfont, "Font instances shoudl not match\n"); + ok(idfont2 != idfont, "Font instances should not match\n"); idfontface2 = NULL; hr = IDWriteFont_CreateFontFace(idfont2, &idfontface2); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0015f98..75e91d5 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1618,7 +1618,7 @@ static void test_guard_page(void) /* test behaviour of VirtualLock - first attempt should fail */ SetLastError( 0xdeadbeef ); success = VirtualLock( base, size ); - ok( !success, "VirtualLock unexpectedly succeded\n" ); + ok( !success, "VirtualLock unexpectedly succeeded\n" ); todo_wine ok( GetLastError() == STATUS_GUARD_PAGE_VIOLATION, "wrong error %u\n", GetLastError() ); @@ -1770,7 +1770,7 @@ static void test_guard_page(void) /* test behaviour of VirtualLock - first attempt should fail without triggering write watches */ SetLastError( 0xdeadbeef ); success = VirtualLock( base, size ); - ok( !success, "VirtualLock unexpectedly succeded\n" ); + ok( !success, "VirtualLock unexpectedly succeeded\n" ); todo_wine ok( GetLastError() == STATUS_GUARD_PAGE_VIOLATION, "wrong error %u\n", GetLastError() ); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9b898d3..39afeb7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1863,8 +1863,8 @@ static void test_Input_mouse(void) ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_RBUTTONUP message\n"); - /* click on HTTRANSPARENT top-level window that belongs to ther thread, - * threads input queues are attached */ + /* click on HTTRANSPARENT top-level window that belongs to other thread, + * thread input queues are attached */ thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, &thread_id); ok(thread != NULL, "CreateThread failed\n"); hittest_no = 0;

1 0

Francois Gouget : msvcr120/tests: Make test_lconv*() static.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 1788674bdb92c5d099a8287cbff36f9d7ba2c266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1788674bdb92c5d099a8287cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 5 12:20:54 2014 +0100 msvcr120/tests: Make test_lconv*() static. --- dlls/msvcr120/tests/msvcr120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index bed1002..c0a582f 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -79,7 +79,7 @@ static BOOL init(void) return TRUE; } -void test_lconv_helper(const char *locstr) +static void test_lconv_helper(const char *locstr) { struct MSVCRT_lconv *lconv; char mbs[256]; @@ -133,7 +133,7 @@ void test_lconv_helper(const char *locstr) ok(strcmp(mbs, lconv->negative_sign) == 0, "%s: negative_sign\n", locstr); } -void test_lconv(void) +static void test_lconv(void) { int i; const char *locstrs[] =

1 0