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

Jacek Caban : rpcrt4: Added RpcServerRegisterIf3 implementation.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 6141cc800c05246c7267c2734e7579545dc623d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6141cc800c05246c7267c2734… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 15:35:13 2016 +0200 rpcrt4: Added RpcServerRegisterIf3 implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 21 +++++++++++++++++---- dlls/rpcrt4/rpcrt4.spec | 1 + include/rpcdce.h | 5 +++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 9c3dea7..809ecef 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1101,7 +1101,7 @@ void RPCRT4_destroy_all_protseqs(void) RPC_STATUS WINAPI RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ) { TRACE("(%p,%s,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv); - return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL ); + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL, NULL ); } /*********************************************************************** @@ -1111,7 +1111,7 @@ RPC_STATUS WINAPI RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid UINT Flags, UINT MaxCalls, RPC_IF_CALLBACK_FN* IfCallbackFn ) { TRACE("(%p,%s,%p,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, IfCallbackFn); - return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, (UINT)-1, IfCallbackFn ); + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, (UINT)-1, IfCallbackFn, NULL ); } /*********************************************************************** @@ -1120,12 +1120,25 @@ RPC_STATUS WINAPI RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn ) { + return RpcServerRegisterIf3( IfSpec, MgrTypeUuid, MgrEpv, Flags, MaxCalls, MaxRpcSize, IfCallbackFn, NULL ); +} + +/*********************************************************************** + * RpcServerRegisterIf3 (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcServerRegisterIf3( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, + UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn, void* SecurityDescriptor) +{ PRPC_SERVER_INTERFACE If = IfSpec; RpcServerInterface* sif; unsigned int i; - TRACE("(%p,%s,%p,%u,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, - MaxRpcSize, IfCallbackFn); + TRACE("(%p,%s,%p,%u,%u,%u,%p,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, + MaxRpcSize, IfCallbackFn, SecurityDescriptor); + + if (SecurityDescriptor) + FIXME("Unsupported SecurityDescriptor argument.\n"); + TRACE(" interface id: %s %d.%d\n", debugstr_guid(&If->InterfaceId.SyntaxGUID), If->InterfaceId.SyntaxVersion.MajorVersion, If->InterfaceId.SyntaxVersion.MinorVersion); diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index af8d639..f85d263 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -434,6 +434,7 @@ @ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) @ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr) @ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr) +@ stdcall RpcServerRegisterIf3(ptr ptr ptr long long long ptr ptr) @ stdcall RpcServerRegisterIf(ptr ptr ptr) @ stdcall RpcServerRegisterIfEx(ptr ptr ptr long long ptr) @ stub RpcServerTestCancel diff --git a/include/rpcdce.h b/include/rpcdce.h index 84f6330..f5f031c 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -453,6 +453,11 @@ RPCRTAPI RPC_STATUS RPC_ENTRY unsigned int Flags, unsigned int MaxCalls, unsigned int MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcServerRegisterIf3( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, + unsigned int Flags, unsigned int MaxCalls, unsigned int MaxRpcSize, + RPC_IF_CALLBACK_FN* IfCallbackFn, void* SecurityDescriptor ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, unsigned int WaitForCallsToComplete ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Nikolay Sivov : dwrite/tests: Use existing macro to define font table tags.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 886875f01e2f1e610cbc49b5617d9aaa71022976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=886875f01e2f1e610cbc49b56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 18 06:47:14 2016 +0300 dwrite/tests: Use existing macro to define font table tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dc9f64e..8ddc0d2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -32,18 +32,14 @@ #include "wine/test.h" -#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - -#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') -#define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') -#define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') -#define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') -#define MS_0S2_TAG MS_MAKE_TAG('O','S','/','2') -#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') -#define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') -#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +#define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') +#define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') +#define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') +#define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') +#define MS_0S2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') +#define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') +#define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x)

1 0

Alistair Leslie-Hughes : d3d11: Support NULL views in d3d10_device_ClearDepthStencilView().
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 75ef613e82afdc4a11b0318efe5769b4865a9792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ef613e82afdc4a11b0318ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 17 19:07:55 2016 +0200 d3d11: Support NULL views in d3d10_device_ClearDepthStencilView(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 12 ++++++++++++ dlls/d3d11/device.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6978c26..ea9845c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -22,6 +22,8 @@ #include "wine/test.h" #include <limits.h> +static BOOL d3d11_available; + struct vec2 { float x, y; @@ -478,6 +480,8 @@ static void test_feature_level(void) return; } + d3d11_available = TRUE; + /* Device was created by D3D10CreateDevice. */ feature_level = ID3D11Device_GetFeatureLevel(device11); ok(feature_level == D3D_FEATURE_LEVEL_10_0, "Got unexpected feature level %#x.\n", feature_level); @@ -6222,6 +6226,14 @@ static void test_clear_depth_stencil_view(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 0.0f, 0); check_texture_color(depth_texture, 0x00000000, 0); + if (d3d11_available) + { + ID3D10Device_ClearDepthStencilView(device, NULL, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0xff); + check_texture_color(depth_texture, 0x00000000, 0); + } + else + win_skip("D3D11 is not available, skipping test.\n"); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0xff); todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9144438..4a83882 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3463,6 +3463,9 @@ static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 * TRACE("iface %p, depth_stencil_view %p, flags %#x, depth %.8e, stencil %u.\n", iface, depth_stencil_view, flags, depth, stencil); + if (!view) + return; + wined3d_flags = wined3d_clear_flags_from_d3d11_clear_flags(flags); wined3d_mutex_lock();

1 0

Alistair Leslie-Hughes : inetcomm: Trace all IMimeBody function parameters.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 860460424427202e0ce49a64b2fa8383435d01dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=860460424427202e0ce49a64b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:33 2016 +0000 inetcomm: Trace all IMimeBody function parameters. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 93 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=860460424427202e0ce49…

1 0

Seong-ho Cho : configure: Add AC_HEADER_MAJOR to find where major() is defined.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: ca8a08606d3f0900b3f4aa8f2e6547882a22dba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8a08606d3f0900b3f4aa8f2… Author: Seong-ho Cho <darkcircle.0426(a)gmail.com> Date: Mon Apr 18 04:25:38 2016 +0900 configure: Add AC_HEADER_MAJOR to find where major() is defined. Signed-off-by: Seong-ho Cho <darkcircle.0426(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + dlls/ntdll/cdrom.c | 5 +++++ dlls/ntdll/directory.c | 5 +++++ dlls/ntdll/file.c | 5 +++++ include/config.h.in | 8 ++++++++ server/fd.c | 5 +++++ 7 files changed, 79 insertions(+) diff --git a/configure b/configure index 1cb0e59..ffb1825 100755 --- a/configure +++ b/configure @@ -6836,6 +6836,56 @@ fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 +$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } +if ${ac_cv_header_sys_types_h_makedev+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> +int +main () +{ +return makedev(0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_header_sys_types_h_makedev=yes +else + ac_cv_header_sys_types_h_makedev=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 +$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } + +if test $ac_cv_header_sys_types_h_makedev = no; then +ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : + +$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h + +fi + + + + if test $ac_cv_header_sys_mkdev_h = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : + +$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h + +fi + + + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } if ${ac_cv_header_stat_broken+:} false; then : diff --git a/configure.ac b/configure.ac index 6189aa9..201bc77 100644 --- a/configure.ac +++ b/configure.ac @@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\ valgrind/valgrind.h \ zlib.h ) +AC_HEADER_MAJOR() AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones **** diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index ee36045..2c64106 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -38,6 +38,11 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #include <sys/types.h> #ifdef HAVE_SYS_IOCTL_H diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 93fe594..4d431c0 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -47,6 +47,11 @@ #ifdef HAVE_SYS_ATTR_H #include <sys/attr.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #ifdef HAVE_SYS_VNODE_H /* Work around a conflict with Solaris' system list defined in sys/list.h. */ #define list SYSLIST diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7e5da59..b3bd9d6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -57,6 +57,11 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef MAJOR_IN_MKDEV +# include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +# include <sys/sysmacros.h> +#endif #ifdef HAVE_UTIME_H # include <utime.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 0650f31..06b192f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1335,6 +1335,14 @@ /* Define to 1 if you have the `__res_get_state' function. */ #undef HAVE___RES_GET_STATE +/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. + */ +#undef MAJOR_IN_MKDEV + +/* Define to 1 if `major', `minor', and `makedev' are declared in + <sysmacros.h>. */ +#undef MAJOR_IN_SYSMACROS + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/server/fd.c b/server/fd.c index 1fd1ce7..17b1b66 100644 --- a/server/fd.c +++ b/server/fd.c @@ -83,6 +83,11 @@ #endif #include <sys/stat.h> #include <sys/time.h> +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +#include <sys/sysmacros.h> +#endif #include <sys/types.h> #include <unistd.h> #ifdef HAVE_SYS_SYSCALL_H

1 0

Andrew Eikum : user32: Grammar fix.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 76f1c254a2f81cc25d81dc0c0bc9acf9c7f2c083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f1c254a2f81cc25d81dc0c0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 15 12:30:47 2016 -0500 user32: Grammar fix. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index bda2b00..5d1117f 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -400,7 +400,7 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci) if (!IsMenu(ci->hWindowMenu)) { - WARN("Window menu handle %p is no more valid\n", ci->hWindowMenu); + WARN("Window menu handle %p is no longer valid\n", ci->hWindowMenu); return 0; }

1 0

Nikolay Sivov : dwrite/tests: Test for lineGap metric.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 0d77aaccf1198376db630c464a21f99b3a3da9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d77aaccf1198376db630c464… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 18 06:47:13 2016 +0300 dwrite/tests: Test for lineGap metric. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 5d8a4ca..dc9f64e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -205,6 +205,23 @@ typedef struct { ULONG maxmemType1; } TT_POST; +typedef struct { + ULONG version; + SHORT ascender; + SHORT descender; + SHORT linegap; + USHORT advanceWidthMax; + SHORT minLeftSideBearing; + SHORT minRightSideBearing; + SHORT xMaxExtent; + SHORT caretSlopeRise; + SHORT caretSlopeRun; + SHORT caretOffset; + SHORT reserved[4]; + SHORT metricDataFormat; + USHORT numberOfHMetrics; +} TT_HHEA; + #include "poppack.h" static IDWriteFactory *create_factory(void) @@ -1534,10 +1551,11 @@ todo_wine static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_METRICS1 *metrics) { - void *os2_context, *head_context, *post_context; + void *os2_context, *head_context, *post_context, *hhea_context; const TT_OS2_V2 *tt_os2; const TT_HEAD *tt_head; const TT_POST *tt_post; + const TT_HHEA *tt_hhea; UINT32 size; BOOL exists; HRESULT hr; @@ -1548,6 +1566,8 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void**)&tt_head, &size, &head_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HHEA_TAG, (const void**)&tt_hhea, &size, &hhea_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_TryGetFontTable(fontface, MS_POST_TAG, (const void**)&tt_post, &size, &post_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1564,6 +1584,7 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET SHORT descent = GET_BE_WORD(tt_os2->sTypoDescender); metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); metrics->descent = descent < 0 ? -descent : 0; + metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); metrics->hasTypographicMetrics = TRUE; } else { @@ -1571,6 +1592,15 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET /* Some fonts have usWinDescent value stored as signed short, which could be wrongly interpreted as large unsigned value. */ metrics->descent = abs((SHORT)GET_BE_WORD(tt_os2->usWinDescent)); + + if (tt_hhea) { + SHORT descender = (SHORT)GET_BE_WORD(tt_hhea->descender); + INT32 linegap; + + linegap = GET_BE_WORD(tt_hhea->ascender) + abs(descender) + GET_BE_WORD(tt_hhea->linegap) - + metrics->ascent - metrics->descent; + metrics->lineGap = linegap > 0 ? linegap : 0; + } } metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); @@ -1606,6 +1636,8 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET IDWriteFontFace_ReleaseFontTable(fontface, os2_context); if (tt_head) IDWriteFontFace_ReleaseFontTable(fontface, head_context); + if (tt_hhea) + IDWriteFontFace_ReleaseFontTable(fontface, hhea_context); if (tt_post) IDWriteFontFace_ReleaseFontTable(fontface, post_context); } @@ -1619,6 +1651,8 @@ static void check_font_metrics(const WCHAR *nameW, BOOL has_metrics1, const DWRI expected->ascent); ok(got->descent == expected->descent, "font %s: descent %u, expected %u\n", wine_dbgstr_w(nameW), got->descent, expected->descent); + ok(got->lineGap == expected->lineGap, "font %s: lineGap %d, expected %d\n", wine_dbgstr_w(nameW), got->lineGap, + expected->lineGap); ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, "

1 0

Nikolay Sivov : d3d11/tests: Add a IDXGISurface1 GetDC() test.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: fda63a754ab2d414928053e35c3721c991acffc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda63a754ab2d414928053e35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 17 19:07:57 2016 +0200 d3d11/tests: Add a IDXGISurface1 GetDC() test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 111 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 103 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index dff29fb..713c9cf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -51,6 +51,12 @@ struct vec4 float x, y, z, w; }; +struct device_desc +{ + const D3D_FEATURE_LEVEL *feature_level; + UINT flags; +}; + struct swapchain_desc { BOOL windowed; @@ -242,18 +248,21 @@ static void check_texture_float_(unsigned int line, ID3D11Texture2D *texture, "Got unexpected value %.8e at (%u, %u).\n", value, x, y); } -static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) +static ID3D11Device *create_device(const struct device_desc *desc) { static const D3D_FEATURE_LEVEL default_feature_level[] = { D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_0, }; + const D3D_FEATURE_LEVEL *feature_level; + UINT flags = desc ? desc->flags : 0; unsigned int feature_level_count; ID3D11Device *device; - if (feature_level) + if (desc && desc->feature_level) { + feature_level = desc->feature_level; feature_level_count = 1; } else @@ -262,13 +271,13 @@ static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) feature_level_count = sizeof(default_feature_level) / sizeof(default_feature_level[0]); } - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; @@ -365,12 +374,15 @@ struct d3d11_test_context static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *context, const D3D_FEATURE_LEVEL *feature_level) { + struct device_desc device_desc; D3D11_VIEWPORT vp; HRESULT hr; memset(context, 0, sizeof(*context)); - if (!(context->device = create_device(feature_level))) + device_desc.feature_level = feature_level; + device_desc.flags = 0; + if (!(context->device = create_device(&device_desc))) { skip_(__FILE__, line)("Failed to create device.\n"); return FALSE; @@ -733,7 +745,11 @@ static void test_device_interfaces(void) for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) { - if (!(device = create_device(&d3d11_feature_levels[i]))) + struct device_desc device_desc; + + device_desc.feature_level = &d3d11_feature_levels[i]; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) { skip("Failed to create device for feature level %#x.\n", d3d11_feature_levels[i]); continue; @@ -2353,8 +2369,11 @@ static void test_create_shader(void) { D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; BOOL todo = feature_level <= D3D_FEATURE_LEVEL_9_3; + struct device_desc device_desc; - if (!(device = create_device(&feature_level))) + device_desc.feature_level = &feature_level; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) { skip("Failed to create device for feature level %#x.\n", feature_level); continue; @@ -6475,6 +6494,81 @@ float4 main(const ps_in v) : SV_TARGET release_test_context(&test_context); } +static void test_getdc(void) +{ + struct device_desc device_desc; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IDXGISurface1 *surface1; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + HDC dc; + + device_desc.feature_level = NULL; + device_desc.flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device.\n"); + return; + } + + /* Without D3D11_RESOURCE_MISC_GDI_COMPATIBLE. */ + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + IDXGISurface1_Release(surface1); + ID3D11Texture2D_Release(texture); + + desc.MiscFlags = D3D11_RESOURCE_MISC_GDI_COMPATIBLE; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + + /* One more time. */ + dc = (HDC)0xdeadbeef; + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(dc == (HDC)0xdeadbeef, "Got unexpected dc %p.\n", dc); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + IDXGISurface1_Release(surface1); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -6513,4 +6607,5 @@ START_TEST(d3d11) test_clear_depth_stencil_view(); test_draw_depth_only(); test_cb_relative_addressing(); + test_getdc(); }

1 0

Alistair Leslie-Hughes : d3d11: Support NULL views in d3d10_device_ClearRenderTargetView().
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 232834a572b3f3d23926c7266e719c3b31ac91b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232834a572b3f3d23926c7266… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 17 19:07:56 2016 +0200 d3d11: Support NULL views in d3d10_device_ClearRenderTargetView(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 9 +++++++++ dlls/d3d11/device.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ea9845c..106e4cc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6079,6 +6079,7 @@ static void test_clear_render_target_view(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; struct d3d10core_test_context test_context; ID3D10Texture2D *texture, *srgb_texture; @@ -6123,6 +6124,14 @@ static void test_clear_render_target_view(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); + if (d3d11_available) + { + ID3D10Device_ClearRenderTargetView(device, NULL, green); + check_texture_color(texture, expected_color, 1); + } + else + win_skip("D3D11 is not available, skipping test.\n"); + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4a83882..fd88ac1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3445,6 +3445,9 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 * TRACE("iface %p, render_target_view %p, color_rgba %s.\n", iface, render_target_view, debug_float4(color_rgba)); + if (!view) + return; + wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, WINED3DCLEAR_TARGET, &color, 0.0f, 0)))

1 0

Jean-Christophe Cardot : winhlp32: Fix some images not shown in certain 16-bit help files.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 91f89b4f96674024b3436423ddb188e838d1ca54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f89b4f96674024b3436423d… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Fri Apr 15 12:08:03 2016 +0200 winhlp32: Fix some images not shown in certain 16-bit help files. Subfiles with bitmap images are usually prefixed with '|', but sometimes not. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 10484a9..2748e5c 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -507,6 +507,18 @@ static BOOL HLPFILE_FindSubFile(HLPFILE* hlpfile, LPCSTR name, BYTE **subbuf, BY WINE_TRACE("looking for file '%s'\n", name); ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), name, comp_FindSubFile); + if (!ptr) + { /* Subfiles with bitmap images are usually prefixed with '|', but sometimes not. + Unfortunately, there is no consensus among different pieces of unofficial + documentation. So remove leading '|' and try again. */ + CHAR c = *name++; + if (c == '|') + { + WINE_TRACE("not found. try '%s'\n", name); + ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), + name, comp_FindSubFile); + } + } if (!ptr) return FALSE; *subbuf = hlpfile->file_buffer + GET_UINT(ptr, strlen(name)+1); if (*subbuf >= hlpfile->file_buffer + hlpfile->file_buffer_size)

1 0