wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Austin English : connect: Add IsInternetConnected stub.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: e94fc1db5a749670102f46df42e327ab8cd0013d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94fc1db5a749670102f46df4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 10 14:12:38 2015 -0600 connect: Add IsInternetConnected stub. --- dlls/connect/connect.spec | 2 +- dlls/connect/main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/connect/connect.spec b/dlls/connect/connect.spec index 6b4da21..7251c34 100644 --- a/dlls/connect/connect.spec +++ b/dlls/connect/connect.spec @@ -7,7 +7,7 @@ @ stub GetVPNConnected @ stub HrIsInternetConnected @ stub HrIsInternetConnectedGUID -@ stub IsInternetConnected +@ stdcall IsInternetConnected() @ stub IsInternetConnectedGUID @ stub IsUniqueConnectionName @ stub RegisterPageWithPage diff --git a/dlls/connect/main.c b/dlls/connect/main.c index 1c12f72..a84ca76 100644 --- a/dlls/connect/main.c +++ b/dlls/connect/main.c @@ -22,6 +22,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(connect); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -36,3 +39,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT WINAPI IsInternetConnected(void) +{ + FIXME("stub, faking success!\n"); + return S_OK; +}

1 0

Matteo Bruni : opengl32: Introduce wrappers for glGetIntegerv and glGetStringi. (v3).
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 9e45ae04137c58e009f62f6e719afde4b3ba0083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e45ae04137c58e009f62f6e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 10 20:13:44 2015 +0100 opengl32: Introduce wrappers for glGetIntegerv and glGetStringi. (v3). --- dlls/opengl32/make_opengl | 8 +++++++- dlls/opengl32/opengl_ext.c | 6 +----- dlls/opengl32/opengl_norm.c | 9 --------- dlls/opengl32/wgl.c | 33 ++++++++++++++++++++++++--------- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 9ca5ebd..2b15f58 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -236,6 +236,7 @@ sub GenerateThunk($$$$) my $trace_arg = ""; return "" if $name eq "glDebugEntry"; + return "" if $name eq "glGetIntegerv"; return "" if $name eq "glGetString"; return "" if $func_ref->[2] && $func_ref->[2]->[0] =~ /WGL_/; @@ -285,6 +286,7 @@ sub GenerateThunk($$$$) } } $ret .= 'void ' if (!@{$func_ref->[1]}); + return "$ret) DECLSPEC_HIDDEN;\n" if $name eq "glGetStringi"; $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; if ($func_ref->[0] ne "void" && $gen_thread_safe) { @@ -951,7 +953,11 @@ my $count = keys %ext_functions; print EXT "const int extension_registry_size = $count;\n"; foreach (sort keys %ext_functions) { my $string = GenerateThunk($_, $ext_functions{$_}, 0, "ext"); - print EXT "\nstatic $string" if $string; + if ($string =~ /DECLSPEC_HIDDEN/) { + print EXT "\n$string"; + } else { + print EXT "\nstatic $string" if $string; + } } # Then the table giving the string <-> function correspondence */ diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 9b9dfa7..67ebc59 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -5014,11 +5014,7 @@ static void WINAPI glGetSharpenTexFuncSGIS( GLenum target, GLfloat* points ) { funcs->ext.p_glGetSharpenTexFuncSGIS( target, points ); } -static const GLubyte* WINAPI glGetStringi( GLenum name, GLuint index ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("(%d, %d)\n", name, index ); - return funcs->ext.p_glGetStringi( name, index ); -} +const GLubyte* WINAPI glGetStringi( GLenum name, GLuint index ) DECLSPEC_HIDDEN; static GLuint WINAPI glGetSubroutineIndex( GLuint program, GLenum shadertype, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index 52fb00b..34a4892 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/dlls/opengl32/opengl_norm.c @@ -948,15 +948,6 @@ void WINAPI glGetFloatv( GLenum pname, GLfloat* data ) { } /*********************************************************************** - * glGetIntegerv (OPENGL32.@) - */ -void WINAPI glGetIntegerv( GLenum pname, GLint* data ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("(%d, %p)\n", pname, data ); - funcs->gl.p_glGetIntegerv( pname, data ); -} - -/*********************************************************************** * glGetLightfv (OPENGL32.@) */ void WINAPI glGetLightfv( GLenum light, GLenum pname, GLfloat* params ) { diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6ff54f0..b028fe0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -687,27 +687,42 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } +void WINAPI glGetIntegerv(GLenum pname, GLint *data) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE("(%d, %p)\n", pname, data); + funcs->gl.p_glGetIntegerv(pname, data); +} + +const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE("(%d, %d)\n", name, index); + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + + *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); + } + + return funcs->ext.p_glGetStringi(name, index); +} + /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext, size_t len ) { if (!list) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *gl_ext; unsigned int i; GLint extensions_count; - if (!funcs->ext.p_glGetStringi) - { - void **func_ptr = (void **)&funcs->ext.p_glGetStringi; - - *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); - } - glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); for (i = 0; i < extensions_count; ++i) { - gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, i); + gl_ext = (const char *)glGetStringi(GL_EXTENSIONS, i); if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) return TRUE; }

1 0

Jacek Caban : vbscript: Added InStrRev implementation.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 9b0ebaeb78374d23e2d1a14ec303b3643d6daca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0ebaeb78374d23e2d1a14ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 10 18:46:25 2015 +0100 vbscript: Added InStrRev implementation. --- dlls/vbscript/global.c | 58 ++++++++++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 58 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index bbbe22c..9bcd2b2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1777,10 +1777,62 @@ static HRESULT Global_StrReverse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt return return_bstr(res, ret); } -static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int start, ret = 0; + BSTR str1, str2; + HRESULT hres; + + TRACE("%s %s arg_cnt=%u\n", debugstr_variant(args), debugstr_variant(args+1), args_cnt); + + if(args_cnt > 3) { + FIXME("Unsupported args\n"); + return E_NOTIMPL; + } + + assert(2 <= args_cnt && args_cnt <= 4); + + if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || V_VT(args+2) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_string(args, &str1); + if(FAILED(hres)) + return hres; + + hres = to_string(args+1, &str2); + if(SUCCEEDED(hres)) { + if(args_cnt > 2) { + hres = to_int(args+2, &start); + if(SUCCEEDED(hres) && start <= 0) { + FIXME("Unsupported start %d\n", start); + hres = E_NOTIMPL; + } + }else { + start = SysStringLen(str1); + } + } + + if(SUCCEEDED(hres)) { + const WCHAR *ptr; + size_t len; + + len = SysStringLen(str2); + if(start >= len && start <= SysStringLen(str1)) { + for(ptr = str1+start-SysStringLen(str2); ptr >= str1; ptr--) { + if(!memcmp(ptr, str2, len*sizeof(WCHAR))) { + ret = ptr-str1+1; + break; + } + } + } + } + + SysFreeString(str1); + SysFreeString(str2); + if(FAILED(hres)) + return hres; + + return return_int(res, ret); } static HRESULT Global_LoadPicture(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1b68d2e..8c92cf5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -282,6 +282,64 @@ Call ok(x = 2, "InStr returned " & x) x = InStr(2.6, "abcd", "bc") Call ok(x = 0, "InStr returned " & x) + +x = InStrRev("bcabcd", "bc") +Call ok(x = 4, "InStrRev returned " & x) +Call ok(getVT(x) = "VT_I4*", "getVT(InStrRev) returned " & getVT(x)) + +x = InStrRev("bcabcd", "bc", 6) +Call ok(x = 4, "InStrRev returned " & x) + +x = InStrRev("abcd", "bcx") +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 3) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "b", 2) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 5) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 15) +Call ok(x = 0, "InStrRev returned " & x) + +x = "abcd" +x = InStrRev(x, "bc") +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 1.3) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2.3) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2.6) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("1234", 34) +Call ok(x = 3, "InStrRev returned " & x) + +x = InStrRev(1234, 34) +Call ok(x = 3, "InStrRev returned " & x) + +Sub testInStrRevError(arg1, arg2, arg3, error_num) + on error resume next + Dim x + + Call Err.clear() + x = InStrRev(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +call testInStrRevError("abcd", null, 2, 94) +call testInStrRevError(null, "abcd", 2, 94) +call testInStrRevError("abcd", "abcd", null, 94) + Sub TestMid(str, start, len, ex) x = Mid(str, start, len) Call ok(x = ex, "Mid(" & str & ", " & start & ", " & len & ") = " & x & " expected " & ex)

1 0

Matteo Bruni : wined3d: Use the proper pitch in read_from_framebuffer().
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: ac3df5e1f1d4595b5d0e9b8404025068ed79bcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3df5e1f1d4595b5d0e9b840… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 10 20:14:49 2015 +0100 wined3d: Use the proper pitch in read_from_framebuffer(). This function is only used in the non-default "backbuffer" ORM. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8aaa82b..8f60769 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2843,7 +2843,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc } /* Setup pixel store pack state -- to glReadPixels into the correct place */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, surface->resource.width); + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, + wined3d_surface_get_pitch(surface) / surface->resource.format->byte_count); checkGLcall("glPixelStorei"); gl_info->gl_ops.gl.p_glReadPixels(0, 0,

1 0

Matteo Bruni : wined3d: Use unsigned short for the bitfields in struct color_fixup_desc.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 20e61b396e98e7b2fefb20c1b4401718da8e4a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e61b396e98e7b2fefb20c1b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 10 20:14:48 2015 +0100 wined3d: Use unsigned short for the bitfields in struct color_fixup_desc. --- dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4373805..539f18c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -95,14 +95,14 @@ enum complex_fixup #include <pshpack2.h> struct color_fixup_desc { - unsigned x_sign_fixup : 1; - unsigned x_source : 3; - unsigned y_sign_fixup : 1; - unsigned y_source : 3; - unsigned z_sign_fixup : 1; - unsigned z_source : 3; - unsigned w_sign_fixup : 1; - unsigned w_source : 3; + unsigned short x_sign_fixup : 1; + unsigned short x_source : 3; + unsigned short y_sign_fixup : 1; + unsigned short y_source : 3; + unsigned short z_sign_fixup : 1; + unsigned short z_source : 3; + unsigned short w_sign_fixup : 1; + unsigned short w_source : 3; }; #include <poppack.h>

1 0

Austin English : mf: Add stub dll.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: a679caedf6ebbce0e193afb200d1d888c2b9776d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a679caedf6ebbce0e193afb20… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 4 12:37:35 2015 -0600 mf: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/mf/Makefile.in | 4 +++ dlls/mf/main.c | 37 ++++++++++++++++++++++++ dlls/mf/mf.spec | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+) diff --git a/configure b/configure index 0307f05..abef0c3 100755 --- a/configure +++ b/configure @@ -1099,6 +1099,7 @@ enable_mcicda enable_mciqtz32 enable_mciseq enable_mciwave +enable_mf enable_mfplat enable_mfreadwrite enable_mgmtapi @@ -17310,6 +17311,7 @@ wine_fn_config_dll mcicda enable_mcicda wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave +wine_fn_config_dll mf enable_mf wine_fn_config_dll mfplat enable_mfplat wine_fn_config_dll mfreadwrite enable_mfreadwrite wine_fn_config_dll mgmtapi enable_mgmtapi diff --git a/configure.ac b/configure.ac index 42d8865..2e6cb4c 100644 --- a/configure.ac +++ b/configure.ac @@ -3022,6 +3022,7 @@ WINE_CONFIG_DLL(mcicda) WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) +WINE_CONFIG_DLL(mf) WINE_CONFIG_DLL(mfplat) WINE_CONFIG_DLL(mfreadwrite) WINE_CONFIG_DLL(mgmtapi) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in new file mode 100644 index 0000000..d7fdb61 --- /dev/null +++ b/dlls/mf/Makefile.in @@ -0,0 +1,4 @@ +MODULE = mf.dll + +C_SRCS = \ + main.c diff --git a/dlls/mf/main.c b/dlls/mf/main.c new file mode 100644 index 0000000..1b223ad --- /dev/null +++ b/dlls/mf/main.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec new file mode 100644 index 0000000..10b682a --- /dev/null +++ b/dlls/mf/mf.spec @@ -0,0 +1,83 @@ +@ stub AppendPropVariant +@ stub ConvertPropVariant +@ stub CopyPropertyStore +@ stub CreateNamedPropertyStore +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub ExtractPropVariant +@ stub MFCreate3GPMediaSink +@ stub MFCreateASFByteStreamPlugin +@ stub MFCreateASFContentInfo +@ stub MFCreateASFIndexer +@ stub MFCreateASFIndexerByteStream +@ stub MFCreateASFMediaSink +@ stub MFCreateASFMediaSinkActivate +@ stub MFCreateASFMultiplexer +@ stub MFCreateASFProfile +@ stub MFCreateASFProfileFromPresentationDescriptor +@ stub MFCreateASFSplitter +@ stub MFCreateASFStreamSelector +@ stub MFCreateASFStreamingMediaSink +@ stub MFCreateASFStreamingMediaSinkActivate +@ stub MFCreateAggregateSource +@ stub MFCreateAppSourceProxy +@ stub MFCreateAudioRenderer +@ stub MFCreateAudioRendererActivate +@ stub MFCreateByteCacheFile +@ stub MFCreateCacheManager +@ stub MFCreateCredentialCache +@ stub MFCreateDeviceSource +@ stub MFCreateDeviceSourceActivate +@ stub MFCreateDrmNetNDSchemePlugin +@ stub MFCreateFileBlockMap +@ stub MFCreateFileSchemePlugin +@ stub MFCreateHttpSchemePlugin +@ stub MFCreateLPCMByteStreamPlugin +@ stub MFCreateMP3ByteStreamPlugin +@ stub MFCreateMP3MediaSink +@ stub MFCreateMPEG4MediaSink +@ stub MFCreateMediaProcessor +@ stub MFCreateMediaSession +@ stub MFCreateNSCByteStreamPlugin +@ stub MFCreateNetSchemePlugin +@ stub MFCreatePMPHost +@ stub MFCreatePMPMediaSession +@ stub MFCreatePMPServer +@ stub MFCreatePresentationClock +@ stub MFCreatePresentationDescriptorFromASFProfile +@ stub MFCreateProxyLocator +@ stub MFCreateRemoteDesktopPlugin +@ stub MFCreateSAMIByteStreamPlugin +@ stub MFCreateSampleCopierMFT +@ stub MFCreateSampleGrabberSinkActivate +@ stub MFCreateSecureHttpSchemePlugin +@ stub MFCreateSequencerSegmentOffset +@ stub MFCreateSequencerSource +@ stub MFCreateSequencerSourceRemoteStream +@ stub MFCreateSimpleTypeHandler +@ stub MFCreateSourceResolver +@ stub MFCreateStandardQualityManager +@ stub MFCreateTopoLoader +@ stub MFCreateTopology +@ stub MFCreateTopologyNode +@ stub MFCreateTranscodeProfile +@ stub MFCreateTranscodeSinkActivate +@ stub MFCreateTranscodeTopology +@ stub MFCreateUrlmonSchemePlugin +@ stub MFCreateVideoRenderer +@ stub MFCreateVideoRendererActivate +@ stub MFCreateWMAEncoderActivate +@ stub MFCreateWMVEncoderActivate +@ stub MFEnumDeviceSources +@ stub MFGetMultipleServiceProviders +@ stub MFGetService +@ stub MFGetSupportedMimeTypes +@ stub MFGetSupportedSchemes +@ stub MFGetTopoNodeCurrentType +@ stub MFReadSequencerSegmentOffset +@ stub MFRequireProtectedEnvironment +@ stub MFShutdownObject +@ stub MFTranscodeGetAudioOutputAvailableTypes +@ stub MergePropertyStore

1 0

Erich E. Hoover : ws2_32/tests: Add an interactive test for interface change notifications.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: c15c7a4925bb095d5a3c2235aa79a5b1e411993b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15c7a4925bb095d5a3c2235a… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Apr 3 09:26:45 2014 -0600 ws2_32/tests: Add an interactive test for interface change notifications. --- dlls/ws2_32/tests/sock.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7288b5c..19663c2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7058,6 +7058,73 @@ static void test_sioRoutingInterfaceQuery(void) closesocket(sock); } +static void test_sioAddressListChange(void) +{ + struct sockaddr_in bindAddress; + struct in_addr net_address; + WSAOVERLAPPED overlapped; + struct hostent *h; + DWORD num_bytes; + SOCKET sock; + int acount; + int ret; + + if (!winetest_interactive) + { + skip("Cannot test SIO_ADDRESS_LIST_CHANGE, interactive tests must be enabled\n"); + return; + } + + /* Use gethostbyname to find the list of local network interfaces */ + h = gethostbyname(""); + if (!h) + { + skip("Cannot test SIO_ADDRESS_LIST_CHANGE, gethostbyname failed with %u\n", + WSAGetLastError()); + return; + } + for (acount = 0; h->h_addr_list[acount]; acount++); + if (acount == 0) + { + skip("Cannot test SIO_ADDRESS_LIST_CHANGE, test requires a network card.\n"); + return; + } + net_address.s_addr = *(ULONG *) h->h_addr_list[0]; + + /* Bind an overlapped socket to the first found network interface */ + sock = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); + if (sock == INVALID_SOCKET) + { + skip("Cannot test SIO_ADDRESS_LIST_CHANGE, socket creation failed with %u\n", + WSAGetLastError()); + return; + } + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = net_address.s_addr; + ret = bind(sock, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + if (ret != 0) + { + skip("Cannot test SIO_ADDRESS_LIST_CHANGE, failed to bind, error %u\n", WSAGetLastError()); + goto end; + } + + /* Wait for address changes, request that the user connect/disconnect an interface */ + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + ret = WSAIoctl(sock, SIO_ADDRESS_LIST_CHANGE, NULL, 0, NULL, 0, &num_bytes, &overlapped, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ok(WSAGetLastError() == WSA_IO_PENDING, "Expected pending last error %d\n", WSAGetLastError()); + trace("Testing socket-based ipv4 address list change notification. Please connect/disconnect or" + " change the ipv4 address of any of the local network interfaces (10 second timeout).\n"); + ret = WaitForSingleObject(overlapped.hEvent, 10000); + ok(ret == WAIT_OBJECT_0, "failed to get overlapped event %u\n", ret); + +end: + closesocket(sock); +} + static void test_synchronous_WSAIoctl(void) { HANDLE previous_port, io_port; @@ -8204,6 +8271,7 @@ START_TEST( sock ) test_ConnectEx(); test_sioRoutingInterfaceQuery(); + test_sioAddressListChange(); test_WSALookupService();

1 0

Erich E. Hoover : server: Implement the interface change notification object.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: 67c47e401ba7bc00b0b178588ff7fbfccc4aef01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c47e401ba7bc00b0b178588… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue May 6 08:49:52 2014 -0600 server: Implement the interface change notification object. --- server/sock.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 199 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 748159f..f3bab85 100644 --- a/server/sock.c +++ b/server/sock.c @@ -46,6 +46,10 @@ #endif #include <time.h> #include <unistd.h> +#include <limits.h> +#ifdef HAVE_LINUX_RTNETLINK_H +# include <linux/rtnetlink.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -979,16 +983,208 @@ static int sock_add_ifchange( struct sock *sock, const async_data_t *async_data return 1; } -/* stub ifchange object */ -static struct object *get_ifchange( void ) +#ifdef HAVE_LINUX_RTNETLINK_H + +/* only keep one ifchange object around, all sockets waiting for wakeups will look to it */ +static struct object *ifchange_object; + +static void ifchange_dump( struct object *obj, int verbose ); +static struct fd *ifchange_get_fd( struct object *obj ); +static void ifchange_destroy( struct object *obj ); + +static int ifchange_get_poll_events( struct fd *fd ); +static void ifchange_poll_event( struct fd *fd, int event ); +static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue ); + +struct ifchange +{ + struct object obj; /* object header */ + struct fd *fd; /* interface change file descriptor */ + struct list sockets; /* list of sockets to send interface change notifications */ +}; + +static const struct object_ops ifchange_ops = +{ + sizeof(struct ifchange), /* size */ + ifchange_dump, /* dump */ + no_get_type, /* get_type */ + add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + ifchange_get_fd, /* get_fd */ + default_fd_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_open_file, /* open_file */ + no_close_handle, /* close_handle */ + ifchange_destroy /* destroy */ +}; + +static const struct fd_ops ifchange_fd_ops = +{ + ifchange_get_poll_events, /* get_poll_events */ + ifchange_poll_event, /* poll_event */ + NULL, /* flush */ + NULL, /* get_fd_type */ + NULL, /* ioctl */ + NULL, /* queue_async */ + ifchange_reselect_async, /* reselect_async */ + NULL /* cancel_async */ +}; + +static void ifchange_dump( struct object *obj, int verbose ) +{ + assert( obj->ops == &ifchange_ops ); + fprintf( stderr, "Interface change\n" ); +} + +static struct fd *ifchange_get_fd( struct object *obj ) +{ + struct ifchange *ifchange = (struct ifchange *)obj; + return (struct fd *)grab_object( ifchange->fd ); +} + +static void ifchange_destroy( struct object *obj ) +{ + struct ifchange *ifchange = (struct ifchange *)obj; + assert( obj->ops == &ifchange_ops ); + + release_object( ifchange->fd ); + + /* reset the global ifchange object so that it will be recreated if it is needed again */ + assert( obj == ifchange_object ); + ifchange_object = NULL; +} + +static int ifchange_get_poll_events( struct fd *fd ) +{ + return POLLIN; +} + +/* wake up all the sockets waiting for a change notification event */ +static void ifchange_wake_up( struct object *obj, unsigned int status ) +{ + struct ifchange *ifchange = (struct ifchange *)obj; + struct list *ptr, *next; + assert( obj->ops == &ifchange_ops ); + assert( obj == ifchange_object ); + + LIST_FOR_EACH_SAFE( ptr, next, &ifchange->sockets ) + { + struct sock *sock = LIST_ENTRY( ptr, struct sock, ifchange_entry ); + + assert( sock->ifchange_q ); + async_wake_up( sock->ifchange_q, status ); /* issue ifchange notification for the socket */ + sock_destroy_ifchange_q( sock ); /* remove socket from list and decrement ifchange refcount */ + } +} + +static void ifchange_poll_event( struct fd *fd, int event ) +{ + struct object *ifchange = get_fd_user( fd ); + unsigned int status = STATUS_PENDING; + char buffer[PIPE_BUF]; + int r; + + r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT ); + if (r < 0) + { + if (errno == EWOULDBLOCK || errno == EAGAIN) + return; /* retry when poll() says the socket is ready */ + status = sock_get_ntstatus( errno ); + } + else if (r > 0) + { + struct nlmsghdr *nlh; + + for (nlh = (struct nlmsghdr *)buffer; NLMSG_OK(nlh, r); nlh = NLMSG_NEXT(nlh, r)) + { + if (nlh->nlmsg_type == NLMSG_DONE) + break; + if (nlh->nlmsg_type == RTM_NEWADDR || nlh->nlmsg_type == RTM_DELADDR) + status = STATUS_SUCCESS; + } + } + else status = STATUS_CANCELLED; + + if (status != STATUS_PENDING) ifchange_wake_up( ifchange, status ); +} + +static void ifchange_reselect_async( struct fd *fd, struct async_queue *queue ) { + /* do nothing, this object is about to disappear */ +} + +#endif + +/* we only need one of these interface notification objects, all of the sockets dependent upon + * it will wake up when a notification event occurs */ + static struct object *get_ifchange( void ) + { +#ifdef HAVE_LINUX_RTNETLINK_H + struct ifchange *ifchange; + struct sockaddr_nl addr; + int unix_fd; + + if (ifchange_object) + { + /* increment the refcount for each socket that uses the ifchange object */ + return grab_object( ifchange_object ); + } + + /* create the socket we need for processing interface change notifications */ + unix_fd = socket( PF_NETLINK, SOCK_RAW, NETLINK_ROUTE ); + if (unix_fd == -1) + { + sock_set_error(); + return NULL; + } + fcntl( unix_fd, F_SETFL, O_NONBLOCK ); /* make socket nonblocking */ + memset( &addr, 0, sizeof(addr) ); + addr.nl_family = AF_NETLINK; + addr.nl_groups = RTMGRP_IPV4_IFADDR; + /* bind the socket to the special netlink kernel interface */ + if (bind( unix_fd, (struct sockaddr *)&addr, sizeof(addr) ) == -1) + { + close( unix_fd ); + sock_set_error(); + return NULL; + } + if (!(ifchange = alloc_object( &ifchange_ops ))) + { + close( unix_fd ); + set_error( STATUS_NO_MEMORY ); + return NULL; + } + list_init( &ifchange->sockets ); + if (!(ifchange->fd = create_anonymous_fd( &ifchange_fd_ops, unix_fd, &ifchange->obj, 0 ))) + { + release_object( ifchange ); + set_error( STATUS_NO_MEMORY ); + return NULL; + } + set_fd_events( ifchange->fd, POLLIN ); /* enable read wakeup on the file descriptor */ + + /* the ifchange object is now successfully configured */ + ifchange_object = &ifchange->obj; + return &ifchange->obj; +#else set_error( STATUS_NOT_SUPPORTED ); return NULL; +#endif } -/* stub ifchange add socket to list */ +/* add the socket to the interface change notification list */ static void ifchange_add_sock( struct object *obj, struct sock *sock ) { +#ifdef HAVE_LINUX_RTNETLINK_H + struct ifchange *ifchange = (struct ifchange *)obj; + + list_add_tail( &ifchange->sockets, &sock->ifchange_entry ); +#endif } /* create a new ifchange queue for a specific socket or, if one already exists, reuse the existing one */

1 0

Erich E. Hoover : server: Add blocked support for SIO_ADDRESS_LIST_CHANGE ioctl().
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: b121f27b72dbe80548c1f2cfd7a1382ef0f149f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b121f27b72dbe80548c1f2cfd… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue May 6 08:44:59 2014 -0600 server: Add blocked support for SIO_ADDRESS_LIST_CHANGE ioctl(). --- server/event.c | 13 +++++++++++++ server/named_pipe.c | 13 ------------- server/object.h | 1 + server/sock.c | 26 ++++++++++++++++++++------ 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/server/event.c b/server/event.c index 4d3c562..0daa5b2 100644 --- a/server/event.c +++ b/server/event.c @@ -124,6 +124,19 @@ struct event *create_event( struct directory *root, const struct unicode_str *na return event; } +obj_handle_t alloc_wait_event( struct process *process ) +{ + obj_handle_t handle = 0; + struct event *event = create_event( NULL, NULL, 0, 1, 0, NULL ); + + if (event) + { + handle = alloc_handle( process, event, EVENT_ALL_ACCESS, 0 ); + release_object( event ); + } + return handle; +} + struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access ) { return (struct event *)get_handle_obj( process, handle, access, &event_ops ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 047b62c..706cce8 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -590,19 +590,6 @@ static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ) return FD_TYPE_PIPE; } -static obj_handle_t alloc_wait_event( struct process *process ) -{ - obj_handle_t handle = 0; - struct event *event = create_event( NULL, NULL, 0, 1, 0, NULL ); - - if (event) - { - handle = alloc_handle( process, event, EVENT_ALL_ACCESS, 0 ); - release_object( event ); - } - return handle; -} - static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, int blocking, const void *data, data_size_t size ) { diff --git a/server/object.h b/server/object.h index dd93b76e..3817c75 100644 --- a/server/object.h +++ b/server/object.h @@ -161,6 +161,7 @@ extern struct event *create_event( struct directory *root, const struct unicode_ const struct security_descriptor *sd ); extern struct keyed_event *create_keyed_event( struct directory *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ); +extern obj_handle_t alloc_wait_event( struct process *process ); extern struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct keyed_event *get_keyed_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern void pulse_event( struct event *event ); diff --git a/server/sock.c b/server/sock.c index 8c8db87..748159f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -116,7 +116,7 @@ struct sock }; static void sock_dump( struct object *obj, int verbose ); -static void sock_add_ifchange( struct sock *sock, const async_data_t *async_data ); +static int sock_add_ifchange( struct sock *sock, const async_data_t *async_data ); static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *sock_get_fd( struct object *obj ); static void sock_destroy( struct object *obj ); @@ -534,14 +534,27 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a int blocking, const void *data, data_size_t size ) { struct sock *sock = get_fd_user( fd ); + obj_handle_t wait_handle = 0; + async_data_t new_data; assert( sock->obj.ops == &sock_ops ); switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: - sock_add_ifchange( sock, async_data ); - return 0; + if (blocking) + { + if (!(wait_handle = alloc_wait_event( current->process ))) return 0; + new_data = *async_data; + new_data.event = wait_handle; + async_data = &new_data; + } + if (!sock_add_ifchange( sock, async_data ) && wait_handle) + { + close_handle( current->process, wait_handle ); + return 0; + } + return wait_handle; default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -944,13 +957,13 @@ static void sock_set_error(void) } /* add interface change notification to a socket */ -static void sock_add_ifchange( struct sock *sock, const async_data_t *async_data ) +static int sock_add_ifchange( struct sock *sock, const async_data_t *async_data ) { struct async_queue *ifchange_q; struct async *async; if (!(ifchange_q = sock_get_ifchange_q( sock ))) - return; + return 0; if (!(async = create_async( current, ifchange_q, async_data ))) { @@ -958,11 +971,12 @@ static void sock_add_ifchange( struct sock *sock, const async_data_t *async_data sock_destroy_ifchange_q( sock ); set_error( STATUS_NO_MEMORY ); - return; + return 0; } release_object( async ); set_error( STATUS_PENDING ); + return 1; } /* stub ifchange object */

1 0

Erich E. Hoover : server: Add socket-side support for the interface change notification object.
by Alexandre Julliard 10 Feb '15

10 Feb '15

Module: wine Branch: master Commit: 315de61bb20a17862911c2e77df7ab25c794e57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=315de61bb20a17862911c2e77… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Tue May 6 08:39:18 2014 -0600 server: Add socket-side support for the interface change notification object. --- server/sock.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 6a75934..8c8db87 100644 --- a/server/sock.c +++ b/server/sock.c @@ -110,12 +110,18 @@ struct sock struct sock *deferred; /* socket that waits for a deferred accept */ struct async_queue *read_q; /* queue for asynchronous reads */ struct async_queue *write_q; /* queue for asynchronous writes */ + struct async_queue *ifchange_q; /* queue for interface change notifications */ + struct object *ifchange_obj; /* the interface change notification object */ + struct list ifchange_entry; /* entry in ifchange notification list */ }; static void sock_dump( struct object *obj, int verbose ); +static void sock_add_ifchange( struct sock *sock, const async_data_t *async_data ); static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *sock_get_fd( struct object *obj ); static void sock_destroy( struct object *obj ); +static struct async_queue *sock_get_ifchange_q( struct sock *sock ); +static void sock_destroy_ifchange_q( struct sock *sock ); static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); @@ -534,7 +540,8 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: - /* intentional fallthrough, not yet supported */ + sock_add_ifchange( sock, async_data ); + return 0; default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -615,6 +622,7 @@ static void sock_destroy( struct object *obj ) free_async_queue( sock->read_q ); free_async_queue( sock->write_q ); + sock_destroy_ifchange_q( sock ); if (sock->event) release_object( sock->event ); if (sock->fd) { @@ -642,6 +650,8 @@ static void init_sock(struct sock *sock) sock->deferred = NULL; sock->read_q = NULL; sock->write_q = NULL; + sock->ifchange_q = NULL; + sock->ifchange_obj = NULL; memset( sock->errors, 0, sizeof(sock->errors) ); } @@ -933,6 +943,81 @@ static void sock_set_error(void) set_error( sock_get_ntstatus( errno ) ); } +/* add interface change notification to a socket */ +static void sock_add_ifchange( struct sock *sock, const async_data_t *async_data ) +{ + struct async_queue *ifchange_q; + struct async *async; + + if (!(ifchange_q = sock_get_ifchange_q( sock ))) + return; + + if (!(async = create_async( current, ifchange_q, async_data ))) + { + if (!async_queued( ifchange_q )) + sock_destroy_ifchange_q( sock ); + + set_error( STATUS_NO_MEMORY ); + return; + } + + release_object( async ); + set_error( STATUS_PENDING ); +} + +/* stub ifchange object */ +static struct object *get_ifchange( void ) +{ + set_error( STATUS_NOT_SUPPORTED ); + return NULL; +} + +/* stub ifchange add socket to list */ +static void ifchange_add_sock( struct object *obj, struct sock *sock ) +{ +} + +/* create a new ifchange queue for a specific socket or, if one already exists, reuse the existing one */ +static struct async_queue *sock_get_ifchange_q( struct sock *sock ) +{ + struct object *ifchange; + struct fd *fd; + + if (sock->ifchange_q) /* reuse existing ifchange_q for this socket */ + return sock->ifchange_q; + + if (!(ifchange = get_ifchange())) + return NULL; + + /* create the ifchange notification queue */ + fd = ifchange->ops->get_fd( ifchange ); + sock->ifchange_q = create_async_queue( fd ); + release_object( fd ); + if (!sock->ifchange_q) + { + release_object( ifchange ); + set_error( STATUS_NO_MEMORY ); + return NULL; + } + + /* add the socket to the ifchange notification list */ + ifchange_add_sock( ifchange, sock ); + sock->ifchange_obj = ifchange; + return sock->ifchange_q; +} + +/* destroy an existing ifchange queue for a specific socket */ +static void sock_destroy_ifchange_q( struct sock *sock ) +{ + if (sock->ifchange_q) + { + list_remove( &sock->ifchange_entry ); + free_async_queue( sock->ifchange_q ); + sock->ifchange_q = NULL; + release_object( sock->ifchange_obj ); + } +} + /* create a socket */ DECL_HANDLER(create_socket) {

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015