December 2014 - Wine-commits

André Hentschel : atl: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 76c24c80c379106c7417f12b5910700bd431cf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c24c80c379106c7417f12b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:30:55 2014 +0100 atl: Fix compiler warnings with flag -Wunused-macros. --- dlls/atl/atl_ax.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 5bafbf1..d7cf074 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1137,7 +1137,6 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) #define GET_DWORD(x) (*(const DWORD *)(x)) #define PUT_BLOCK(x,y) do {if (!advance_array(&output, &allocated, &filled, (x), (y))) return NULL;} while (0) #define PUT_WORD(x) do {WORD w = (x);PUT_BLOCK(&w, 1);} while(0) -#define PUT_DWORD(x) do {DWORD w = (x);PUT_BLOCK(&w, 2);} while(0) const WORD *tmp, *src = (const WORD *)src_tmpl; WORD *output; DWORD allocated, filled; /* in WORDs */

1 0

Michael Stefaniuc : msi: Remove no-op toupperW() statement (PVS-Studio).
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 165c9e7cb991956287b981c0259c71c18f01c73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=165c9e7cb991956287b981c02… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 10 10:59:59 2014 +0100 msi: Remove no-op toupperW() statement (PVS-Studio). --- dlls/msi/action.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1e527da..34697f3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2423,7 +2423,6 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) sprintfW( buf, fmtW, free.QuadPart / 512 ); msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); } - toupperW( primary_folder[0] ); msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); } msi_free( primary_folder );

1 0

Martin Storsjo : msvcr120_app: Add forwarding dll.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: a44e013b49e362c8bbcec79ebc7277d3658eba31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44e013b49e362c8bbcec79eb… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 10 10:44:44 2014 +0200 msvcr120_app: Add forwarding dll. --- configure | 2 + configure.ac | 1 + dlls/msvcr120_app/Makefile.in | 1 + dlls/msvcr120_app/msvcr120_app.spec | 2158 +++++++++++++++++++++++++++++++++++ tools/make_specfiles | 4 + 5 files changed, 2166 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a44e013b49e362c8bbcec…

1 0

Martin Storsjo : include: Add hstring.idl and winstring.h.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 42b8a7674ab92d13dc4043806b8111ebf0e1094a URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b8a7674ab92d13dc4043806… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 10 10:50:37 2014 +0200 include: Add hstring.idl and winstring.h. --- include/Makefile.in | 2 ++ include/hstring.idl | 41 ++++++++++++++++++++++++++++++++++++++++ include/winstring.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 5b1f3ab..c9f683a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -47,6 +47,7 @@ PUBLIC_IDL_H_SRCS = \ fusion.idl \ gameux.idl \ hlink.idl \ + hstring.idl \ htiface.idl \ htiframe.idl \ httprequest.idl \ @@ -618,6 +619,7 @@ SRCDIR_INCLUDES = \ winsock.h \ winsock2.h \ winspool.h \ + winstring.h \ winsvc.h \ wintab.h \ wintabx.h \ diff --git a/include/hstring.idl b/include/hstring.idl new file mode 100644 index 0000000..2623f34 --- /dev/null +++ b/include/hstring.idl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2014 Martin Storsjo + * + * 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 + */ + +import "wtypes.idl"; + +typedef struct HSTRING__ +{ + int unused; +} HSTRING__; + +typedef [wire_marshal(wireBSTR), unique] HSTRING__* HSTRING; + +cpp_quote("DECLARE_HANDLE(HSTRING_BUFFER);") + +cpp_quote("typedef struct HSTRING_HEADER") +cpp_quote("{") +cpp_quote(" union") +cpp_quote(" {") +cpp_quote(" PVOID Reserved1;") +cpp_quote("#ifdef _WIN64") +cpp_quote(" char Reserved2[24];") +cpp_quote("#else") +cpp_quote(" char Reserved2[20];") +cpp_quote("#endif") +cpp_quote(" } Reserved;") +cpp_quote("} HSTRING_HEADER;") diff --git a/include/winstring.h b/include/winstring.h new file mode 100644 index 0000000..27c299b --- /dev/null +++ b/include/winstring.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2014 Martin Storsjo + * + * 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 + */ + +#ifndef __WINE_WINSTRING_H +#define __WINE_WINSTRING_H + +#include <hstring.h> + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *order); +HRESULT WINAPI WindowsConcatString(HSTRING str1, HSTRING str2, HSTRING *out); +HRESULT WINAPI WindowsCreateString(LPCWSTR ptr, UINT32 len, HSTRING *out); +HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, + HSTRING_HEADER *header, HSTRING *out); +HRESULT WINAPI WindowsDeleteString(HSTRING str); +HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf); +HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out); +UINT32 WINAPI WindowsGetStringLen(HSTRING str); +LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len); +BOOL WINAPI WindowsIsStringEmpty(HSTRING str); +HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, HSTRING_BUFFER *out); +HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out); +HRESULT WINAPI WindowsReplaceString(HSTRING haystack, HSTRING needle, HSTRING replacement, + HSTRING *out); +HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out); +HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 pos, HSTRING *out); +HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 pos, + UINT32 len, HSTRING *out); +HRESULT WINAPI WindowsTrimStringEnd(HSTRING str, HSTRING charstr, HSTRING *out); +HRESULT WINAPI WindowsTrimStringStart(HSTRING str, HSTRING charstr, HSTRING *out); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINSTRING_H */

1 0

Henri Verbeet : wined3d: Use __builtin_clz() in wined3d_log2i() when available.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: f5939399f04ac96b71fae16413241d38d032ff10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5939399f04ac96b71fae1641… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:34 2014 +0100 wined3d: Use __builtin_clz() in wined3d_log2i() when available. --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 9 +++++++++ dlls/wined3d/utils.c | 5 +++++ include/config.h.in | 3 +++ 4 files changed, 50 insertions(+) diff --git a/configure b/configure index 2677e43..e679696 100755 --- a/configure +++ b/configure @@ -16448,6 +16448,39 @@ done LIBS="$ac_save_LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5 +$as_echo_n "checking for __builtin_clz... " >&6; } +if ${ac_cv_have___builtin_clz+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +return __builtin_clz(1) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_have___builtin_clz="yes" +else + ac_cv_have___builtin_clz="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_have___builtin_clz" >&5 +$as_echo "$ac_cv_have___builtin_clz" >&6; } +if test "$ac_cv_have___builtin_clz" = "yes" +then + +$as_echo "#define HAVE___BUILTIN_CLZ 1" >>confdefs.h + +fi + case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __i386__" >&5 diff --git a/configure.ac b/configure.ac index 8110995..6f4e719 100644 --- a/configure.ac +++ b/configure.ac @@ -2595,6 +2595,15 @@ AC_CHECK_FUNCS(\ ) LIBS="$ac_save_LIBS" +dnl Check for __builtin_clz +AC_CACHE_CHECK([for __builtin_clz], ac_cv_have___builtin_clz, + AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_clz(1)]])], + [ac_cv_have___builtin_clz="yes"], [ac_cv_have___builtin_clz="no"])) +if test "$ac_cv_have___builtin_clz" = "yes" +then + AC_DEFINE(HAVE___BUILTIN_CLZ, 1, [Define to 1 if you have the `__builtin_clz' built-in function.]) +fi + dnl *** check for the need to define platform-specific symbols case $host_cpu in diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d3fb1d6..566d921 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3929,8 +3929,12 @@ const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions = wined3d_ffp_vertex_program_key_compare, }; +/* Return the integer base-2 logarithm of x. Undefined for x == 0. */ UINT wined3d_log2i(UINT32 x) { +#ifdef HAVE___BUILTIN_CLZ + return __builtin_clz(x) ^ 0x1f; +#else static const UINT l[] = { ~0U, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, @@ -3953,6 +3957,7 @@ UINT wined3d_log2i(UINT32 x) UINT32 i; return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +#endif } const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, diff --git a/include/config.h.in b/include/config.h.in index 0370c6d..a8ae6c5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1281,6 +1281,9 @@ /* Define to 1 if you have the `_vsnprintf' function. */ #undef HAVE__VSNPRINTF +/* Define to 1 if you have the `__builtin_clz' built-in function. */ +#undef HAVE___BUILTIN_CLZ + /* Define to 1 if you have the `__res_getservers' function. */ #undef HAVE___RES_GETSERVERS

1 0

Henri Verbeet : ddraw: Use wined3d_log2i() to calculate the level count in ddraw_surface_create().
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: af9ccb490a66d1991587a13b7e2aaa36a07bc7f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9ccb490a66d1991587a13b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:35 2014 +0100 ddraw: Use wined3d_log2i() to calculate the level count in ddraw_surface_create(). --- dlls/ddraw/surface.c | 9 +-------- dlls/wined3d/utils.c | 31 ------------------------------- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 556d32f..a4184b8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5817,14 +5817,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { /* Undocumented feature: Create sublevels until either the * width or the height is 1. */ - DWORD min = desc->dwWidth < desc->dwHeight ? desc->dwWidth : desc->dwHeight; - - desc->u2.dwMipMapCount = 0; - while (min) - { - ++desc->u2.dwMipMapCount; - min >>= 1; - } + desc->u2.dwMipMapCount = wined3d_log2i(min(desc->dwWidth, desc->dwHeight)) + 1; } } else diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 566d921..6ce07b8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3929,37 +3929,6 @@ const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions = wined3d_ffp_vertex_program_key_compare, }; -/* Return the integer base-2 logarithm of x. Undefined for x == 0. */ -UINT wined3d_log2i(UINT32 x) -{ -#ifdef HAVE___BUILTIN_CLZ - return __builtin_clz(x) ^ 0x1f; -#else - static const UINT l[] = - { - ~0U, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - }; - UINT32 i; - - return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; -#endif -} - const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8e649a..7935a5d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2824,7 +2824,6 @@ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DE /* Math utils */ void multiply_matrix(struct wined3d_matrix *dest, const struct wined3d_matrix *src1, const struct wined3d_matrix *src2) DECLSPEC_HIDDEN; -UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; void wined3d_release_dc(HWND window, HDC dc) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index baa102a..0cf26e1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -26,6 +26,10 @@ #ifndef __WINE_WINED3D_H #define __WINE_WINED3D_H +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #include "wine/list.h" #define WINED3D_OK S_OK @@ -2555,4 +2559,35 @@ HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, void __cdecl wined3d_volume_preload(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); +/* Return the integer base-2 logarithm of x. Undefined for x == 0. */ +static inline unsigned int wined3d_log2i(unsigned int x) +{ +#ifdef HAVE___BUILTIN_CLZ + return __builtin_clz(x) ^ 0x1f; +#else + static const unsigned int l[] = + { + ~0u, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + }; + unsigned int i; + + return (i = x >> 16) ? (x = i >> 8) ? l[x] + 24 : l[i] + 16 : (i = x >> 8) ? l[i] + 8 : l[x]; +#endif +} + #endif /* __WINE_WINED3D_H */

1 0

Henri Verbeet : d3d8: Calculate texture levels in d3d8 instead of wined3d.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 1a28c7c5cc2e4bc4719e3bcc28ba0a5b25c5b61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a28c7c5cc2e4bc4719e3bcc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:36 2014 +0100 d3d8: Calculate texture levels in d3d8 instead of wined3d. --- dlls/d3d8/texture.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 54944ac..24c0b28 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1172,6 +1172,9 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) surface_flags |= WINED3D_SURFACE_MAPPABLE; + if (!levels) + levels = wined3d_log2i(max(width, height)) + 1; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1214,6 +1217,9 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) surface_flags |= WINED3D_SURFACE_MAPPABLE; + if (!levels) + levels = wined3d_log2i(edge_length) + 1; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1252,6 +1258,9 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.depth = depth; desc.size = 0; + if (!levels) + levels = wined3d_log2i(max(max(width, height), depth)) + 1; + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0, texture, &d3d8_texture_wined3d_parent_ops, &texture->wined3d_texture);

1 0

Henri Verbeet : d3d9: Calculate texture levels in d3d9 instead of wined3d.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 3b3b74510b0bc52a5b52a1438517e0381a43be45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3b74510b0bc52a5b52a1438… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:37 2014 +0100 d3d9: Calculate texture levels in d3d9 instead of wined3d. --- dlls/d3d9/texture.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 432d248..c35ccdd 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1296,6 +1296,14 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) surface_flags |= WINED3D_SURFACE_MAPPABLE; + if (!levels) + { + if (usage & D3DUSAGE_AUTOGENMIPMAP) + levels = 1; + else + levels = wined3d_log2i(max(width, height)) + 1; + } + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1338,6 +1346,14 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) surface_flags |= WINED3D_SURFACE_MAPPABLE; + if (!levels) + { + if (usage & D3DUSAGE_AUTOGENMIPMAP) + levels = 1; + else + levels = wined3d_log2i(edge_length) + 1; + } + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, surface_flags, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); @@ -1376,6 +1392,14 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.depth = depth; desc.size = 0; + if (!levels) + { + if (usage & D3DUSAGE_AUTOGENMIPMAP) + levels = 1; + else + levels = wined3d_log2i(max(max(width, height), depth)) + 1; + } + wined3d_mutex_lock(); hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0, texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture);

1 0

Henri Verbeet : d3d10core: Calculate the texture level count before texture creation.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: c0cb43311b92c5745d940665d0b3c76abbecc368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cb43311b92c5745d940665d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 10 13:26:38 2014 +0100 d3d10core: Calculate the texture level count before texture creation. --- dlls/d3d10core/texture.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 5e112dd..d9354ee 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -251,6 +251,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic const D3D10_TEXTURE2D_DESC *desc) { struct wined3d_resource_desc wined3d_desc; + unsigned int levels; HRESULT hr; texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl; @@ -300,7 +301,9 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic wined3d_desc.depth = 1; wined3d_desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, desc->MipLevels, + levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(max(desc->Width, desc->Height)) + 1; + + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, levels, 0, texture, &d3d10_texture2d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); @@ -308,7 +311,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic IUnknown_Release(texture->dxgi_surface); return hr; } - texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture); + texture->desc.MipLevels = levels; texture->device = &device->ID3D10Device1_iface; ID3D10Device1_AddRef(texture->device); @@ -517,6 +520,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic const D3D10_TEXTURE3D_DESC *desc) { struct wined3d_resource_desc wined3d_desc; + unsigned int levels; HRESULT hr; texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; @@ -534,13 +538,15 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic wined3d_desc.depth = desc->Depth; wined3d_desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, desc->MipLevels, + levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(max(max(desc->Width, desc->Height), desc->Depth)) + 1; + + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, levels, 0, texture, &d3d10_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); return hr; } - texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture); + texture->desc.MipLevels = levels; texture->device = &device->ID3D10Device1_iface; ID3D10Device1_AddRef(texture->device);

1 0

Austin English : mfplat: Add stub dll.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: cf811f718422456264645e757f1f1981ab229d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf811f718422456264645e757… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 8 17:36:19 2014 -0800 mfplat: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/mfplat/Makefile.in | 4 ++ dlls/mfplat/main.c | 38 ++++++++++++ dlls/mfplat/mfplat.spec | 156 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 201 insertions(+) diff --git a/configure b/configure index e679696..49919c1 100755 --- a/configure +++ b/configure @@ -1096,6 +1096,7 @@ enable_mcicda enable_mciqtz32 enable_mciseq enable_mciwave +enable_mfplat enable_mgmtapi enable_midimap enable_mlang @@ -17177,6 +17178,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 mfplat enable_mfplat wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang clean,implib diff --git a/configure.ac b/configure.ac index 6f4e719..dfd4393 100644 --- a/configure.ac +++ b/configure.ac @@ -3005,6 +3005,7 @@ WINE_CONFIG_DLL(mcicda) WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) +WINE_CONFIG_DLL(mfplat) WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[clean,implib]) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in new file mode 100644 index 0000000..2b5bd24 --- /dev/null +++ b/dlls/mfplat/Makefile.in @@ -0,0 +1,4 @@ +MODULE = mfplat.dll + +C_SRCS = \ + main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c new file mode 100644 index 0000000..a72f634 --- /dev/null +++ b/dlls/mfplat/main.c @@ -0,0 +1,38 @@ +/* + * + * Copyright 2014 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/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec new file mode 100644 index 0000000..98a7147 --- /dev/null +++ b/dlls/mfplat/mfplat.spec @@ -0,0 +1,156 @@ +@ stub FormatTagFromWfx +@ stub MFCreateGuid +@ stub MFGetIoPortHandle +@ stub MFGetPlatformVersion +@ stub MFGetRandomNumber +@ stub MFIsFeatureEnabled +@ stub MFIsQueueThread +@ stub MFPlatformBigEndian +@ stub MFPlatformLittleEndian +@ stub ValidateWaveFormat +@ stub CopyPropVariant +@ stub CreatePropVariant +@ stub CreatePropertyStore +@ stub DestroyPropVariant +@ stub GetAMSubtypeFromD3DFormat +@ stub GetD3DFormatFromMFSubtype +@ stub LFGetGlobalPool +@ stub MFAddPeriodicCallback +@ stub MFAllocateWorkQueue +@ stub MFAllocateWorkQueueEx +@ stub MFAppendCollection +@ stub MFAverageTimePerFrameToFrameRate +@ stub MFBeginCreateFile +@ stub MFBeginGetHostByName +@ stub MFBeginRegisterWorkQueueWithMMCSS +@ stub MFBeginUnregisterWorkQueueWithMMCSS +@ stub MFBlockThread +@ stub MFCalculateBitmapImageSize +@ stub MFCalculateImageSize +@ stub MFCancelCreateFile +@ stub MFCancelWorkItem +@ stub MFCompareFullToPartialMediaType +@ stub MFCompareSockaddrAddresses +@ stub MFConvertColorInfoFromDXVA +@ stub MFConvertColorInfoToDXVA +@ stub MFConvertFromFP16Array +@ stub MFConvertToFP16Array +@ stub MFCopyImage +@ stub MFCreateAMMediaTypeFromMFMediaType +@ stub MFCreateAlignedMemoryBuffer +@ stub MFCreateAsyncResult +@ stub MFCreateAttributes +@ stub MFCreateAudioMediaType +@ stub MFCreateCollection +@ stub MFCreateEventQueue +@ stub MFCreateFile +@ stub MFCreateLegacyMediaBufferOnMFMediaBuffer +@ stub MFCreateMFByteStreamOnStream +@ stub MFCreateMFVideoFormatFromMFMediaType +@ stub MFCreateMediaBufferWrapper +@ stub MFCreateMediaEvent +@ stub MFCreateMediaType +@ stub MFCreateMediaTypeFromRepresentation +@ stub MFCreateMemoryBuffer +@ stub MFCreateMemoryStream +@ stub MFCreatePathFromURL +@ stub MFCreatePresentationDescriptor +@ stub MFCreateSample +@ stub MFCreateSocket +@ stub MFCreateSocketListener +@ stub MFCreateSourceResolver +@ stub MFCreateStreamDescriptor +@ stub MFCreateSystemTimeSource +@ stub MFCreateSystemUnderlyingClock +@ stub MFCreateTempFile +@ stub MFCreateTransformActivate +@ stub MFCreateURLFromPath +@ stub MFCreateUdpSockets +@ stub MFCreateVideoMediaType +@ stub MFCreateVideoMediaTypeFromBitMapInfoHeader +@ stub MFCreateVideoMediaTypeFromBitMapInfoHeaderEx +@ stub MFCreateVideoMediaTypeFromSubtype +@ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 +@ stub MFCreateVideoMediaTypeFromVideoInfoHeader +@ stub MFCreateWaveFormatExFromMFMediaType +@ stub MFDeserializeAttributesFromStream +@ stub MFDeserializeEvent +@ stub MFDeserializeMediaTypeFromStream +@ stub MFDeserializePresentationDescriptor +@ stub MFEndCreateFile +@ stub MFEndGetHostByName +@ stub MFEndRegisterWorkQueueWithMMCSS +@ stub MFEndUnregisterWorkQueueWithMMCSS +@ stub MFFrameRateToAverageTimePerFrame +@ stub MFFreeAdaptersAddresses +@ stub MFGetAdaptersAddresses +@ stub MFGetAttributesAsBlob +@ stub MFGetAttributesAsBlobSize +@ stub MFGetConfigurationDWORD +@ stub MFGetConfigurationPolicy +@ stub MFGetConfigurationStore +@ stub MFGetConfigurationString +@ stub MFGetMFTMerit +@ stub MFGetNumericNameFromSockaddr +@ stub MFGetPlaneSize +@ stub MFGetPlatform +@ stub MFGetPluginControl +@ stub MFGetPrivateWorkqueues +@ stub MFGetSockaddrFromNumericName +@ stub MFGetStrideForBitmapInfoHeader +@ stub MFGetSystemTime +@ stub MFGetTimerPeriodicity +@ stub MFGetUncompressedVideoFormat +@ stub MFGetWorkQueueMMCSSClass +@ stub MFGetWorkQueueMMCSSTaskId +@ stub MFHeapAlloc +@ stub MFHeapFree +@ stub MFInitAMMediaTypeFromMFMediaType +@ stub MFInitAttributesFromBlob +@ stub MFInitMediaTypeFromAMMediaType +@ stub MFInitMediaTypeFromMFVideoFormat +@ stub MFInitMediaTypeFromMPEG1VideoInfo +@ stub MFInitMediaTypeFromMPEG2VideoInfo +@ stub MFInitMediaTypeFromVideoInfoHeader2 +@ stub MFInitMediaTypeFromVideoInfoHeader +@ stub MFInitMediaTypeFromWaveFormatEx +@ stub MFInitVideoFormat +@ stub MFInitVideoFormat_RGB +@ stub MFInvokeCallback +@ stub MFJoinIoPort +@ stub MFLockPlatform +@ stub MFLockWorkQueue +@ stub MFPutWorkItem +@ stub MFPutWorkItemEx +@ stub MFRecordError +@ stub MFRemovePeriodicCallback +@ stub MFScheduleWorkItem +@ stub MFScheduleWorkItemEx +@ stub MFSerializeAttributesToStream +@ stub MFSerializeEvent +@ stub MFSerializeMediaTypeToStream +@ stub MFSerializePresentationDescriptor +@ stub MFSetSockaddrAny +@ stub MFShutdown +@ stub MFStartup +@ stub MFStreamDescriptorProtectMediaType +@ stub MFTEnum +@ stub MFTEnumEx +@ stub MFTGetInfo +@ stub MFTRegister +@ stub MFTRegisterLocal +@ stub MFTRegisterLocalByCLSID +@ stub MFTUnregister +@ stub MFTUnregisterLocal +@ stub MFTUnregisterLocalByCLSID +@ stub MFTraceError +@ stub MFTraceFuncEnter +@ stub MFUnblockThread +@ stub MFUnlockPlatform +@ stub MFUnlockWorkQueue +@ stub MFUnwrapMediaType +@ stub MFValidateMediaTypeSize +@ stub MFWrapMediaType +@ stub MFllMulDiv +@ stub PropVariantFromStream +@ stub PropVariantToStream

1 0