December 2014 - Wine-Commits

Bruno Jesus : ws2_32/tests: Add SO_BSP_STATE tests.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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

Michael Stefaniuc : jscript: Merge two if blocks with identical condition (PVS-Studio).
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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

Vincent Povirk : wbemprox: Implement Win32_OperatingSystem:: TotalVisibleMemorySize.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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

Francois Gouget : dwrite: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

Module: wine Branch: master Commit: d1040304b2b507839a0c6cb7222a875ad8f6f5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1040304b2b507839a0c6cb72… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 5 12:55:00 2014 +0100 dwrite: Fix compilation on systems that don't support nameless unions. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 135ea4d..df3d2dd 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2120,8 +2120,8 @@ static HRESULT WINAPI localfontfilestream_GetLastWriteTime(IDWriteFontFileStream TRACE("(%p)->(%p)\n", This, last_writetime); - li.LowPart = This->entry->key->writetime.dwLowDateTime; - li.HighPart = This->entry->key->writetime.dwHighDateTime; + li.u.LowPart = This->entry->key->writetime.dwLowDateTime; + li.u.HighPart = This->entry->key->writetime.dwHighDateTime; *last_writetime = li.QuadPart; return S_OK;

1 0

Francois Gouget : dwrite: Add a trailing '\n' to a FIXME().
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

Module: wine Branch: master Commit: eaf4f695d16a08b00440d5331d18a7a06a6e299f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf4f695d16a08b00440d5331… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 5 12:20:47 2014 +0100 dwrite: Add a trailing '\n' to a FIXME(). --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a76dd4b..9bd434c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1196,7 +1196,7 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA heap_free(name_string); } else { - FIXME("handle NAME format 1"); + FIXME("handle NAME format 1\n"); continue; } }

1 0

Francois Gouget : msvcr120/tests: Make test_lconv*() static.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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

Martin Storsjo : api-ms-win-core-errorhandling-l1-1-2: Add stub dll.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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

Mark Harmstone : mmdevapi: Allow GetPropValue function in audio drivers.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

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

Michael Müller : api-ms-win-core-fibers-l1-1-0: Add dll.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 762b6af348a300c29205d05617301d94493f8ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=762b6af348a300c29205d0561… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Nov 26 21:31:43 2014 +0100 api-ms-win-core-fibers-l1-1-0: Add dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index df48de3..600f687 100755 --- a/configure +++ b/configure @@ -858,6 +858,7 @@ enable_api_ms_win_core_console_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_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_l1_2_0 enable_api_ms_win_core_file_l2_1_0 @@ -16780,6 +16781,7 @@ wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console 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-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 wine_fn_config_dll api-ms-win-core-file-l2-1-0 enable_api_ms_win_core_file_l2_1_0 diff --git a/configure.ac b/configure.ac index eea1baf..ded14e8 100644 --- a/configure.ac +++ b/configure.ac @@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(api-ms-win-core-console-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-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) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) diff --git a/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in b/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in new file mode 100644 index 0000000..f4cc782 --- /dev/null +++ b/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-fibers-l1-1-0.dll diff --git a/dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec b/dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec new file mode 100644 index 0000000..26afab1 --- /dev/null +++ b/dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall FlsAlloc(ptr) kernel32.FlsAlloc +@ stdcall FlsFree(long) kernel32.FlsFree +@ stdcall FlsGetValue(long) kernel32.FlsGetValue +@ stdcall FlsSetValue(long ptr) kernel32.FlsSetValue diff --git a/tools/make_specfiles b/tools/make_specfiles index 641f18e..8866ab2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -159,6 +159,7 @@ my @dll_groups = "api-ms-win-core-file-l2-1-1", "api-ms-win-core-sysinfo-l1-2-1", "api-ms-win-core-processthreads-l1-1-2", + "api-ms-win-core-fibers-l1-1-0", "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-file-l2-1-0", "api-ms-win-core-localization-l1-2-1",

1 0

André Hentschel : wininet: Remove unused strings ( Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: cdf2412203ef520ed741ddd776190a3bff5c2ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf2412203ef520ed741ddd77… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:54:53 2014 +0100 wininet: Remove unused strings (Clang). --- dlls/wininet/http.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cb30b26..b2a85c7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -77,7 +77,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0}; static const WCHAR g_szHttp1_1[] = {'H','T','T','P','/','1','.','1',0}; static const WCHAR szOK[] = {'O','K',0}; -static const WCHAR szDefaultHeader[] = {'H','T','T','P','/','1','.','0',' ','2','0','0',' ','O','K',0}; static const WCHAR hostW[] = { 'H','o','s','t',0 }; static const WCHAR szAuthorization[] = { 'A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; @@ -85,7 +84,6 @@ static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 }; static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0}; static const WCHAR szGET[] = { 'G','E','T', 0 }; static const WCHAR szHEAD[] = { 'H','E','A','D', 0 }; -static const WCHAR szCrLf[] = {'\r','\n', 0}; static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 }; static const WCHAR szAccept_Charset[] = { 'A','c','c','e','p','t','-','C','h','a','r','s','e','t', 0 };

1 0