April 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfreadwrite: Implement MF_SOURCE_READER_ANY_STREAM for synchronous case.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 978d497d95d40f1189d663c7a9cdd5aa065c7905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=978d497d95d40f1189d663c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 6 17:19:29 2020 +0300 mfreadwrite: Implement MF_SOURCE_READER_ANY_STREAM for synchronous case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 146 +++++++++++++++++++++++++--------------- dlls/mfreadwrite/tests/mfplat.c | 43 +++++++----- 2 files changed, 119 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=978d497d95d40f1189d6…

1 0

Chip Davis : d3d8: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 36cd136a6b440b22b7fc2420377de8449b58930b URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cd136a6b440b22b7fc2420… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 16:01:18 2020 +0430 d3d8: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cde7664515..6a67f81778 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -35,7 +35,8 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) BYTE *c = (BYTE *)&format; /* Don't translate FOURCC formats */ - if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format; + if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) + return (D3DFORMAT)format; switch(format) { @@ -85,7 +86,8 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) BYTE *c = (BYTE *)&format; /* Don't translate FOURCC formats */ - if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format; + if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) + return (enum wined3d_format_id)format; switch(format) {

1 0

Dmitry Timoshkov : adsldp: Recognize ADS_SEARCHPREF_PAGESIZE in IDirectorySearch::SetSearchPreference().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 5c8f688f1a332af736197aa098e36c049cba968d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8f688f1a332af736197aa0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:51 2020 +0800 adsldp: Recognize ADS_SEARCHPREF_PAGESIZE in IDirectorySearch::SetSearchPreference(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 2b5f621fba..952e4931d4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -400,6 +400,7 @@ typedef struct struct { ADS_SCOPEENUM scope; + int pagesize; } search; } LDAP_namespace; @@ -1214,6 +1215,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S break; } + case ADS_SEARCHPREF_PAGESIZE: + if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) + { + FIXME("ADS_SEARCHPREF_PAGESIZE: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("PAGESIZE: %d\n", prefs[i].vValue.u.Integer); + ldap->search.pagesize = prefs[i].vValue.u.Integer; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1713,6 +1727,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs_count_allocated = 0; ldap->attrs = NULL; ldap->search.scope = ADS_SCOPE_SUBTREE; + ldap->search.pagesize = 0; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0;

1 0

Chip Davis : d3d9/tests: Use compare_uint() in a couple more places.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: ea70874aa10a663c3045dafab34533ccb488938f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea70874aa10a663c3045dafa… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 10:57:55 2020 -0500 d3d9/tests: Use compare_uint() in a couple more places. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 92116b3eb8..f873f3ae9b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1514,7 +1514,7 @@ static void test_clear_different_size_surfaces(void) depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); for (x = 0; x < 4; ++x) { - ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + ok(compare_uint(depth[x], 0x7fff, 2), "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); } } hr = IDirect3DSurface9_UnlockRect(ds); @@ -1729,7 +1729,7 @@ static void color_fill_test(void) /* Windows drivers disagree on how to promote the 8 bit per channel * input argument to 16 bit for D3DFMT_G16R16. */ ok(color_match(surface_data[0], formats[i].fill_value, 2) && - abs((expected_a) - (fill_a)) < 3, + compare_uint(expected_a, fill_a, 2), "Expected clear value 0x%08x, got 0x%08x, fmt=%s.\n", formats[i].fill_value, surface_data[0], formats[i].name); hr = IDirect3DSurface9_UnlockRect(surface);

1 0

Mathew Hodson : user32/tests: Don't report cursor handle since it always changes.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: a8dee2a23f449adad2dc8ba96ad39c74d717fc4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8dee2a23f449adad2dc8ba9… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Fri Mar 27 21:02:11 2020 -0400 user32/tests: Don't report cursor handle since it always changes. Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index ff4ab5d875..d2265be9b1 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2332,7 +2332,7 @@ static void test_SetCursor(void) ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); /* global cursor doesn't change since we don't have a window */ ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ - "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + "expected global cursor %p\n", global_cursor ); } thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); WaitForSingleObject( thread, 1000 ); @@ -2364,7 +2364,7 @@ static void test_SetCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ - "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + "expected global cursor %p\n", global_cursor ); } SetCursor( old_cursor ); DestroyCursor( cursor ); @@ -2381,7 +2381,7 @@ static void test_SetCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ - "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + "expected global cursor %p\n", global_cursor ); } }

1 0

Zebediah Figura : mountmgr: Determine and store the filesystem type, label, and serial.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 37ed6559034d47829fbb2e60eb93f7060476004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ed6559034d47829fbb2e60… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 27 10:32:28 2020 -0500 mountmgr: Determine and store the filesystem type, label, and serial. Copied with minimal adaptation from kernel32/volume.c Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 598 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 598 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37ed6559034d47829fbb…

1 0

Chip Davis : iphlpapi: Use res_getservers() if available to get the DNS server list.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 39464e86a058ddc1ad199b80210dcf5467005018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39464e86a058ddc1ad199b80… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Apr 5 17:29:00 2020 -0500 iphlpapi: Use res_getservers() if available to get the DNS server list. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 39 +++++++++++++++++++++++++++++++++++++ configure.ac | 14 ++++++++++++++ dlls/iphlpapi/iphlpapi_main.c | 45 ++++++++++++++++++++++++++++++++++++++++++- include/config.h.in | 3 +++ 4 files changed, 100 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 116825768c..6db2725807 100755 --- a/configure +++ b/configure @@ -14203,6 +14203,45 @@ $as_echo "#define HAVE_RESOLV 1" >>confdefs.h RESOLV_LIBS=$ac_cv_have_resolv ;; esac + + if test "x$ac_cv_have_resolv" != "xnot found" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_getservers" >&5 +$as_echo_n "checking for res_getservers... " >&6; } +if ${ac_cv_have_res_getservers+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_LIBS="$LIBS" + LIBS="$RESOLV_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <resolv.h> +int +main () +{ +res_getservers(NULL, NULL, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_have_res_getservers=yes +else + ac_cv_have_res_getservers=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_res_getservers" >&5 +$as_echo "$ac_cv_have_res_getservers" >&6; } + if test "$ac_cv_have_res_getservers" = "yes" + then + +$as_echo "#define HAVE_RES_GETSERVERS 1" >>confdefs.h + + fi + fi fi if test "x$with_cms" != "xno" diff --git a/configure.ac b/configure.ac index 76d5d5ed72..9e29234b42 100644 --- a/configure.ac +++ b/configure.ac @@ -1535,6 +1535,20 @@ then AC_DEFINE(HAVE_RESOLV, 1) AC_SUBST(RESOLV_LIBS,$ac_cv_have_resolv) ;; esac + + if test "x$ac_cv_have_resolv" != "xnot found" + then + AC_CACHE_CHECK([for res_getservers], ac_cv_have_res_getservers, + [ac_save_LIBS="$LIBS" + LIBS="$RESOLV_LIBS $LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[#include <resolv.h>]],[[res_getservers(NULL, NULL, 0);]])],[ac_cv_have_res_getservers=yes],[ac_cv_have_res_getservers=no]) + LIBS="$ac_save_LIBS"]) + if test "$ac_cv_have_res_getservers" = "yes" + then + AC_DEFINE(HAVE_RES_GETSERVERS, 1, [Define to 1 if you have the `res_getservers' function.]) + fi + fi fi dnl **** Check for LittleCMS *** diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b8ae327a13..e3ce21c44b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1249,7 +1249,8 @@ static void sockaddr_in_to_WS_storage( SOCKADDR_STORAGE *dst, const struct socka } #if defined(HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6) || \ - (defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS)) + (defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS)) || \ + defined(HAVE_RES_GETSERVERS) static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in6 *src ) { SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)dst; @@ -1284,6 +1285,47 @@ static void initialise_resolver(void) LeaveCriticalSection(&res_init_cs); } +#ifdef HAVE_RES_GETSERVERS +static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) +{ + struct __res_state *state = &_res; + int i, found = 0, total; + SOCKADDR_STORAGE *addr = servers; + union res_sockaddr_union *buf; + + initialise_resolver(); + + total = res_getservers( state, NULL, 0 ); + + if ((!servers || !num) && !ip4_only) return total; + + buf = HeapAlloc( GetProcessHeap(), 0, total * sizeof(union res_sockaddr_union) ); + total = res_getservers( state, buf, total ); + + for (i = 0; i < total; i++) + { + if (buf[i].sin6.sin6_family == AF_INET6 && ip4_only) continue; + if (buf[i].sin.sin_family != AF_INET && buf[i].sin6.sin6_family != AF_INET6) continue; + + found++; + if (!servers || !num) continue; + + if (buf[i].sin6.sin6_family == AF_INET6) + { + sockaddr_in6_to_WS_storage( addr, &buf[i].sin6 ); + } + else + { + sockaddr_in_to_WS_storage( addr, &buf[i].sin ); + } + if (++addr >= servers + num) break; + } + + HeapFree( GetProcessHeap(), 0, buf ); + return found; +} +#else + static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) { int i, ip6_count = 0; @@ -1319,6 +1361,7 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) } return addr - servers; } +#endif #elif defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS) static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only ) diff --git a/include/config.h.in b/include/config.h.in index db9c7a1e7d..8ccbf0e7e5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -761,6 +761,9 @@ /* Define to 1 if you have the <resolv.h> header file. */ #undef HAVE_RESOLV_H +/* Define to 1 if you have the `res_getservers' function. */ +#undef HAVE_RES_GETSERVERS + /* Define to 1 if you have the `rint' function. */ #undef HAVE_RINT

1 0

Alexandre Julliard : mountmgr.sys: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: cf19a7ac4f6c01d2ac9516b5691a420b73fd1673 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf19a7ac4f6c01d2ac9516b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:47:56 2020 +0200 mountmgr.sys: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 17 +++++++---------- dlls/mountmgr.sys/mountmgr.c | 1 - 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index c6d5d0b7af..27b35acd9c 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -44,7 +44,6 @@ #include "ip2string.h" #include "dhcpcsdk.h" -#include "wine/library.h" #include "wine/exception.h" #include "wine/debug.h" @@ -116,20 +115,19 @@ HAL_FUNCS; static BOOL load_hal_functions(void) { void *hal_handle; - char error[128]; /* Load libhal with RTLD_GLOBAL so that the dbus symbols are available. * We can't load libdbus directly since libhal may have been built against a * different version but with the same soname. Binary compatibility is for wimps. */ - if (!(hal_handle = wine_dlopen(SONAME_LIBHAL, RTLD_NOW|RTLD_GLOBAL, error, sizeof(error)))) + if (!(hal_handle = dlopen( SONAME_LIBHAL, RTLD_NOW | RTLD_GLOBAL ))) goto failed; -#define DO_FUNC(f) if (!(p_##f = wine_dlsym( RTLD_DEFAULT, #f, error, sizeof(error) ))) goto failed +#define DO_FUNC(f) if (!(p_##f = dlsym( RTLD_DEFAULT, #f ))) goto failed DBUS_FUNCS; #undef DO_FUNC -#define DO_FUNC(f) if (!(p_##f = wine_dlsym( hal_handle, #f, error, sizeof(error) ))) goto failed +#define DO_FUNC(f) if (!(p_##f = dlsym( hal_handle, #f ))) goto failed HAL_FUNCS; #undef DO_FUNC @@ -137,7 +135,7 @@ static BOOL load_hal_functions(void) return TRUE; failed: - WARN( "failed to load HAL support: %s\n", error ); + WARN( "failed to load HAL support: %s\n", dlerror() ); return FALSE; } @@ -185,18 +183,17 @@ static GUID *parse_uuid( GUID *guid, const char *str ) static BOOL load_dbus_functions(void) { void *handle; - char error[128]; - if (!(handle = wine_dlopen(SONAME_LIBDBUS_1, RTLD_NOW, error, sizeof(error)))) + if (!(handle = dlopen( SONAME_LIBDBUS_1, RTLD_NOW ))) goto failed; -#define DO_FUNC(f) if (!(p_##f = wine_dlsym( handle, #f, error, sizeof(error) ))) goto failed +#define DO_FUNC(f) if (!(p_##f = dlsym( handle, #f ))) goto failed DBUS_FUNCS; #undef DO_FUNC return TRUE; failed: - WARN( "failed to load DBUS support: %s\n", error ); + WARN( "failed to load DBUS support: %s\n", dlerror() ); return FALSE; } diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 3d84af47a6..21712dc9ce 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -34,7 +34,6 @@ #include "mountmgr.h" #include "winreg.h" -#include "wine/library.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h"

1 0

Alexandre Julliard : glu32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 55e1e0c525022b2bcc18d0d4862df56195a6645a URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e1e0c525022b2bcc18d0d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:46:18 2020 +0200 glu32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 8f0a360ff9..827b1012bb 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -27,7 +27,6 @@ #include "wine/wgl.h" #include "wine/glu.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(glu); @@ -116,12 +115,10 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static BOOL WINAPI load_libglu( INIT_ONCE *once, void *param, void **context ) { #ifdef SONAME_LIBGLU - char error[256]; - - if ((libglu_handle = wine_dlopen( SONAME_LIBGLU, RTLD_NOW, error, sizeof(error) ))) + if ((libglu_handle = dlopen( SONAME_LIBGLU, RTLD_NOW ))) TRACE( "loaded %s\n", SONAME_LIBGLU ); else - ERR( "Failed to load %s: %s\n", SONAME_LIBGLU, error ); + ERR( "Failed to load %s: %s\n", SONAME_LIBGLU, dlerror() ); #else ERR( "libGLU is needed but support was not included at build time\n" ); #endif @@ -133,7 +130,7 @@ static void *load_glufunc( const char *name ) void *ret; if (!InitOnceExecuteOnce( &init_once, load_libglu, NULL, NULL )) return NULL; - if (!(ret = wine_dlsym( libglu_handle, name, NULL, 0 ))) ERR( "Can't find %s\n", name ); + if (!(ret = dlsym( libglu_handle, name ))) ERR( "Can't find %s\n", name ); return ret; }

1 0

Zebediah Figura : ntdll: Implement NtQueryVolumeInformationFile(FileFsVolumeInformation).
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 021d9f07602da5d61a27f86c86f6a06a38ee2e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=021d9f07602da5d61a27f86c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 27 10:32:33 2020 -0500 ntdll: Implement NtQueryVolumeInformationFile(FileFsVolumeInformation). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 36 ++++++++++++++++++++++++++++++++---- dlls/ntdll/tests/file.c | 7 ++----- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 71343c25be..1adc1e094e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3262,7 +3262,6 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io { int fd, needs_close; struct stat st; - static int once; io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); if (io->u.Status == STATUS_BAD_DEVICE_TYPE) @@ -3285,9 +3284,6 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io switch( info_class ) { - case FileFsVolumeInformation: - if (!once++) FIXME( "%p: volume info not supported\n", handle ); - break; case FileFsLabelInformation: FIXME( "%p: label info not supported\n", handle ); break; @@ -3448,6 +3444,38 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io io->u.Status = STATUS_SUCCESS; break; } + case FileFsVolumeInformation: + { + FILE_FS_VOLUME_INFORMATION *info = buffer; + struct mountmgr_unix_drive *drive; + const WCHAR *label; + + if (length < sizeof(FILE_FS_VOLUME_INFORMATION)) + { + io->u.Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (!(drive = get_mountmgr_fs_info( handle, fd ))) + { + ERR_(winediag)("Failed to query volume information from mountmgr.\n"); + io->u.Status = STATUS_NOT_IMPLEMENTED; + break; + } + + label = (WCHAR *)((char *)drive + drive->label_offset); + info->VolumeCreationTime.QuadPart = 0; /* FIXME */ + info->VolumeSerialNumber = drive->serial; + info->VolumeLabelLength = min( wcslen( label ) * sizeof(WCHAR), + length - offsetof( FILE_FS_VOLUME_INFORMATION, VolumeLabel ) ); + info->SupportsObjects = (drive->fs_type == MOUNTMGR_FS_TYPE_NTFS); + memcpy( info->VolumeLabel, label, info->VolumeLabelLength ); + RtlFreeHeap( GetProcessHeap(), 0, drive ); + + io->Information = offsetof( FILE_FS_VOLUME_INFORMATION, VolumeLabel ) + info->VolumeLabelLength; + io->u.Status = STATUS_SUCCESS; + break; + } case FileFsControlInformation: FIXME( "%p: control info not supported\n", handle ); break; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 546795456a..33b8ead552 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3900,8 +3900,6 @@ static void test_query_volume_information_file(void) ffvi = (FILE_FS_VOLUME_INFORMATION *)buf; -todo_wine -{ ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); @@ -3909,10 +3907,9 @@ todo_wine "expected %d, got %lu\n", (FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel) + ffvi->VolumeLabelLength), io.Information); - ok(ffvi->VolumeCreationTime.QuadPart != 0, "Missing VolumeCreationTime\n"); - ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); + todo_wine ok(ffvi->VolumeCreationTime.QuadPart != 0, "Missing VolumeCreationTime\n"); + todo_wine ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); ok(ffvi->SupportsObjects == 1,"expected 1, got %d\n", ffvi->SupportsObjects); -} ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %d\n", ffvi->VolumeLabelLength); trace("VolumeSerialNumber: %x VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel));

1 0