January 2016 - Wine-Commits

Alexandre Julliard : server: Always print the full path of objects when dumping them.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: d15f47412effbcb20105d87e94f3a114e0e26449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15f47412effbcb20105d87e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 21:08:56 2016 +0900 server: Always print the full path of objects when dumping them. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 4 +--- server/device.c | 6 +----- server/directory.c | 12 ++---------- server/event.c | 10 ++-------- server/handle.c | 1 + server/mailslot.c | 3 +-- server/mapping.c | 4 +--- server/mutex.c | 4 +--- server/named_pipe.c | 9 ++------- server/object.c | 24 +++++++++++++++++------- server/semaphore.c | 4 +--- server/symlink.c | 6 ++---- server/timer.c | 4 +--- server/winstation.c | 8 ++------ 14 files changed, 35 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d15f47412effbcb20105d…

1 0

Huw Davies : oleaut32: Use the helper to access bstr_t.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 13bc86c03422d381ae7bf19a6132d370e93a7675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13bc86c03422d381ae7bf19a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 10:29:49 2016 +0000 oleaut32: Use the helper to access bstr_t. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 214421c..8a22c2e 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -360,7 +360,8 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) if (*old!=NULL) { BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); - bstr_t *bstr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,bstr_alloc_size(newbytelen)); + bstr_t *old_bstr = bstr_from_str(*old); + bstr_t *bstr = HeapReAlloc(GetProcessHeap(), 0, old_bstr, bstr_alloc_size(newbytelen)); *old = bstr->u.str; bstr->size = newbytelen; /* Subtle hidden feature: The old string data is still there

1 0

Huw Davies : oleaut32: BSTRs should have 8 byte alignment on 64 bits.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 36f454cda0dc1fd5fbd1521ad8d1883be6995375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f454cda0dc1fd5fbd1521ad… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 10:29:50 2016 +0000 oleaut32: BSTRs should have 8 byte alignment on 64 bits. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 3 +++ dlls/oleaut32/tests/vartype.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 8a22c2e..07db9ff 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -84,6 +84,9 @@ static CRITICAL_SECTION_DEBUG cs_bstr_cache_dbg = static CRITICAL_SECTION cs_bstr_cache = { &cs_bstr_cache_dbg, -1, 0, 0, 0, 0 }; typedef struct { +#ifdef _WIN64 + DWORD pad; +#endif DWORD size; union { char ptr[1]; diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d905d37..f7df9c5 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5398,9 +5398,12 @@ static void test_SysAllocString(void) if (str) { LPINTERNAL_BSTR bstr = Get(str); + DWORD_PTR p = (DWORD_PTR)str; + int align = sizeof(void *); ok (bstr->dwLen == 8, "Expected 8, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szTest), "String different\n"); + ok ((p & ~(align-1)) == p, "Not aligned to %d\n", align); SysFreeString(str); } }

1 0

Austin English : winspool.drv: Add EnumPrinterKeyA/W stubs.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 110b53affcd00e375e1232b9ce0755defed1a631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110b53affcd00e375e1232b9c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 19 13:10:10 2016 -0600 winspool.drv: Add EnumPrinterKeyA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 2 ++ include/winspool.h | 6 ++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 04def86..cebf6f7 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7527,6 +7527,26 @@ DWORD WINAPI EnumPrinterDataW( HANDLE hPrinter, DWORD dwIndex, LPWSTR pValueName } /***************************************************************************** + * EnumPrinterKeyA [WINSPOOL.@] + * + */ +DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, CHAR *subkey, DWORD size, DWORD *needed) +{ + FIXME("%p %s %p %x %p\n", printer, debugstr_a(key), subkey, size, needed); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/***************************************************************************** + * EnumPrinterKeyW [WINSPOOL.@] + * + */ +DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, WCHAR *subkey, DWORD size, DWORD *needed) +{ + FIXME("%p %s %p %x %p\n", printer, debugstr_w(key), subkey, size, needed); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/***************************************************************************** * EnumPrintProcessorDatatypesA [WINSPOOL.@] * */ diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index b0d30b8..9b8062c 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -124,6 +124,8 @@ @ stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) @ stdcall EnumPrintersA(long ptr long ptr long ptr ptr) @ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) +@ stdcall EnumPrinterKeyA(long str ptr long ptr) +@ stdcall EnumPrinterKeyW(long wstr ptr long ptr) @ stdcall ExtDeviceMode(long long ptr str str ptr str long) @ stdcall FindClosePrinterChangeNotification(long) @ stdcall FindFirstPrinterChangeNotification(long long long ptr) diff --git a/include/winspool.h b/include/winspool.h index 42097fb..b11438f 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1789,6 +1789,12 @@ BOOL WINAPI DeletePrintProvidorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPrintProvidorName); #define DeletePrintProvidor WINELIB_NAME_AW(DeletePrintProvidor) +DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, + CHAR *subkey, DWORD size, DWORD *needed); +DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, + WCHAR *subkey, DWORD size, DWORD *needed); +#define EnumPrinterKey WINELIB_NAME_AW(EnumPrinterKey) + DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPBYTE pEnumValues, DWORD cbEnumValues, LPDWORD pcbEnumValues, LPDWORD pnEnumValues);

1 0

Alex Henrie : server: Fix duplicate, incorrect comment describing is_fd_signaled.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: df59b040577d7b9bc093968223dcc4de5571efba URL: http://source.winehq.org/git/wine.git/?a=commit;h=df59b040577d7b9bc09396822… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 20 21:02:27 2016 -0700 server: Fix duplicate, incorrect comment describing is_fd_signaled. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index e3fe292..559a737 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1952,7 +1952,7 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } -/* set or clear the fd signaled state */ +/* check if fd is signaled */ int is_fd_signaled( struct fd *fd ) { return fd->signaled;

1 0

Alexandre Julliard : configure: Don' t check for gnutls_hash if gnutls is missing entirely.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 90eb492a870470700a351913bc8e0724914bd9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90eb492a870470700a351913b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 15:53:14 2016 +0900 configure: Don't check for gnutls_hash if gnutls is missing entirely. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ++++++++++++------------ configure.ac | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index a17ad55..d0a7266 100755 --- a/configure +++ b/configure @@ -11585,18 +11585,7 @@ _ACEOF fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - GNUTLS_CFLAGS="" -fi - - -CPPFLAGS=$ac_save_CPPFLAGS -test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` -test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` - - ac_wine_check_funcs_save_LIBS="$LIBS" + ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $GNUTLS_LIBS" for ac_func in gnutls_hash do : @@ -11613,6 +11602,17 @@ done LIBS="$ac_wine_check_funcs_save_LIBS" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + GNUTLS_CFLAGS="" +fi + + +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + +fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : case "x$with_gnutls" in x) as_fn_append wine_warnings "|libgnutls ${notice_platform}development files not found, no schannel support." ;; diff --git a/configure.ac b/configure.ac index 23fee7b..d20791a 100644 --- a/configure.ac +++ b/configure.ac @@ -1268,10 +1268,10 @@ then [AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], - [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], + [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]]) + WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, + [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])])])], [GNUTLS_CFLAGS=""])]) - WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, - [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], [libgnutls ${notice_platform}development files not found, no schannel support.])

1 0

Alexandre Julliard : configure: Don't check for gst/gstpad.h that we don' t use.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: cfb88194f260b7ada7cc55d216ed2fd8f970cc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb88194f260b7ada7cc55d21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 17:01:13 2016 +0900 configure: Don't check for gst/gstpad.h that we don't use. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 13 +++---------- configure.ac | 16 +++++++--------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/configure b/configure index d0a7266..e422437 100755 --- a/configure +++ b/configure @@ -12634,13 +12634,11 @@ ac_gst_incl="" done GSTREAMER_CFLAGS=$ac_gst_incl CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default" -if test "x$ac_cv_header_gst_gstpad_h" = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" + ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gst_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/gst.h is indeed 64-bit" >&5 $as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gst/gst.h> int @@ -12654,7 +12652,7 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_new in -lgstreamer-1.0" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_new in -lgstreamer-1.0" >&5 $as_echo_n "checking for gst_pad_new in -lgstreamer-1.0... " >&6; } if ${ac_cv_lib_gstreamer_1_0_gst_pad_new+:} false; then : $as_echo_n "(cached) " >&6 @@ -12702,11 +12700,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -else - GSTREAMER_CFLAGS="" -fi - - CPPFLAGS=$ac_save_CPPFLAGS test -z "$GSTREAMER_CFLAGS" || GSTREAMER_CFLAGS=`echo " $GSTREAMER_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` diff --git a/configure.ac b/configure.ac index d20791a..6db503c 100644 --- a/configure.ac +++ b/configure.ac @@ -1472,15 +1472,13 @@ then done GSTREAMER_CFLAGS=$ac_gst_incl CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - AC_CHECK_HEADER([gst/gstpad.h], - [AC_CHECK_HEADER([gst/gst.h], - [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], - [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], - [AC_MSG_RESULT([no])])])], - [GSTREAMER_CFLAGS=""])]) + AC_CHECK_HEADER([gst/gst.h], + [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], + [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], + [AC_MSG_RESULT([yes]) + AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], + [AC_MSG_RESULT([no])])])]) fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes], [gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled])

1 0

Aaryaman Vasishta : d3drm: Fix QueryInterface for IDirect3DRMTexture*.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 47913f1c1c58bd62756c54910865c7cedcfc8501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47913f1c1c58bd62756c54910… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jan 20 20:54:14 2016 +0530 d3drm: Fix QueryInterface for IDirect3DRMTexture*. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/texture.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 46d968a..080c6f8 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -679,21 +679,26 @@ static HRESULT WINAPI d3drm_texture3_QueryInterface(IDirect3DRMTexture3 *iface, TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2) - || IsEqualGUID(riid, &IID_IDirect3DRMTexture) + if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { + *out = &texture->IDirect3DRMTexture3_iface; + } + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2)) + { *out = &texture->IDirect3DRMTexture2_iface; } - else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture)) { - *out = &texture->IDirect3DRMTexture3_iface; + *out = &texture->IDirect3DRMTexture_iface; } else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0

Aaryaman Vasishta : d3drm/tests: Add QueryInterface tests for IDirect3DRMTexture*.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 858ea7a76efc912040a5612b7d021d83e0b7e123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858ea7a76efc912040a5612b7… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Tue Jan 19 20:17:14 2016 +0530 d3drm/tests: Add QueryInterface tests for IDirect3DRMTexture*. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 60fe0b4..4a1c180 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3967,6 +3967,131 @@ static void test_load_texture(void) IDirect3DRM_Release(d3drm1); } +static void test_texture_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRM3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMWinDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObject, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMViewport, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewport2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisual, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMMesh, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLight, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMTexture2, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMTexture3, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMWrap, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimation, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimation2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObjectArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDeviceArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewportArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrameArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisualArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLightArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPickedArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFaceArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMUserVisual, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMInterpolator, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMProgressiveMesh, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPicked2Array, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMClippedVisual, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawClipper, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface4, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw4, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DLight, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IUnknown, &IID_IUnknown, S_OK, }, + }; + HRESULT hr; + IDirect3DRM *d3drm1; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IDirect3DRMTexture *texture1; + IDirect3DRMTexture2 *texture2; + IDirect3DRMTexture3 *texture3; + IUnknown *unknown; + char *filename; + BOOL check; + + hr = Direct3DRMCreate(&d3drm1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x)\n", hr); + filename = create_bitmap(1, 1, TRUE); + hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr); + hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr); + IDirect3DRMTexture_Release(texture1); + test_qi("texture1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr); + hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr); + IDirect3DRMTexture2_Release(texture2); + test_qi("texture2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr); + hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr); + IDirect3DRMTexture3_Release(texture3); + test_qi("texture3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); + check = DeleteFileA(filename); + ok(check, "Cannot delete image stored in %s (error = %d).\n", filename, GetLastError()); + HeapFree(GetProcessHeap(), 0, filename); +} + START_TEST(d3drm) { test_MeshBuilder(); @@ -3995,4 +4120,5 @@ START_TEST(d3drm) test_create_device_from_d3d2(); test_create_device_from_d3d3(); test_load_texture(); + test_texture_qi(); }

1 0

Jeremy Newman : switch wiki logo to mediawiki
by Jeremy Newman Jan. 21, 2016

Jan. 21, 2016

Module: website Branch: master Commit: 14bdcd4254c559b288e70a30ae2d32cb7ec52585 URL: http://source.winehq.org/git/website.git/?a=commit;h=14bdcd4254c559b288e70a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 21 09:21:00 2016 -0600 switch wiki logo to mediawiki --- images/mediawiki.png | Bin 0 -> 4877 bytes images/moinmoin.png | Bin 2198 -> 0 bytes templates/de/help.template | 2 +- templates/en/help.template | 2 +- templates/fr/help.template | 2 +- templates/pl/help.template | 2 +- templates/pt/help.template | 2 +- templates/tr/help.template | 2 +- templates/uk/help.template | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/mediawiki.png b/images/mediawiki.png new file mode 100644 index 0000000..ce6531a Binary files /dev/null and b/images/mediawiki.png differ diff --git a/images/moinmoin.png b/images/moinmoin.png deleted file mode 100644 index 7d830bb..0000000 Binary files a/images/moinmoin.png and /dev/null differ diff --git a/templates/de/help.template b/templates/de/help.template index 936fc3c..38287e1 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -47,7 +47,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Du kannst auch in unserem <a href="https://wiki.winehq.org/">Wiki</a> nachschauen, ob du diff --git a/templates/en/help.template b/templates/en/help.template index 58e1905..1358d98 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -45,7 +45,7 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </div> <div class="col-xs-10 col-md-11"> You can also see our <a href="https://wiki.winehq.org/">Wiki</a> to diff --git a/templates/fr/help.template b/templates/fr/help.template index 5f4d627..a02f44d 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -47,7 +47,7 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Notre <a href="https://wiki.winehq.org/PageD'Accueil">wiki</a> peut aussi vous aider. diff --git a/templates/pl/help.template b/templates/pl/help.template index e88fc56..b071f1b 100644 --- a/templates/pl/help.template +++ b/templates/pl/help.template @@ -46,7 +46,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Szukaj odpowiedzi na swoje pytania na naszej <a href="https://wiki.winehq.org/Polish">Wiki</a>. diff --git a/templates/pt/help.template b/templates/pt/help.template index 1f59d40..1da308d 100644 --- a/templates/pt/help.template +++ b/templates/pt/help.template @@ -46,7 +46,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Você também pode ler a nossa <a href="https://wiki.winehq.org/">Wiki</a> para tentar diff --git a/templates/tr/help.template b/templates/tr/help.template index 0c7abc7..bf4addd 100644 --- a/templates/tr/help.template +++ b/templates/tr/help.template @@ -44,7 +44,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Viki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Viki</a> </td> <td valign="top"> Sorunuza yanıt bulup bulamayacağınızı görmeniz için ayrıca <a href="https://wiki.winehq.org/">Viki</a> sayfamıza da bakabilirsiniz. diff --git a/templates/uk/help.template b/templates/uk/help.template index 5a2fa2a..0c3d5e6 100644 --- a/templates/uk/help.template +++ b/templates/uk/help.template @@ -41,7 +41,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Подивіться нашу <a href="https://wiki.winehq.org/">Wiki</a>, щоб знайти відповідь на своє питання.

1 0