March 2016 - Wine-commits - list.winehq.org

Hugh McMaster : reg: Display the default value name when ask_confirm() is passed "" for reg_info.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 8220a32e0ab33b4ee145f29ae294c7fa1affde86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8220a32e0ab33b4ee145f29ae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 2 21:31:19 2016 +1100 reg: Display the default value name when ask_confirm() is passed "" for reg_info. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6ae4aa1..6f3db63 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -151,6 +151,7 @@ static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) WCHAR Nbuffer[4]; WCHAR defval[32]; WCHAR answer[MAX_PATH]; + WCHAR *str; DWORD count; hmod = GetModuleHandleW(NULL); @@ -158,9 +159,11 @@ static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) LoadStringW(hmod, STRING_NO, Nbuffer, ARRAY_SIZE(Nbuffer)); LoadStringW(hmod, STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); + str = (reg_info && strlenW(reg_info)) ? reg_info : defval; + while (1) { - output_message(msgid, reg_info ? reg_info : defval); + output_message(msgid, str); output_message(STRING_YESNO); ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count, NULL); answer[0] = toupperW(answer[0]);

1 0

Michael Müller : shutdown: Add stub implementation.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 183e8cf14e85546cb93533184782959fdf9e75ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=183e8cf14e85546cb93533184… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 2 07:46:42 2016 +0100 shutdown: Add stub implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/shutdown/Makefile.in | 5 +++++ programs/shutdown/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index 02ba099..692b26f 100755 --- a/configure +++ b/configure @@ -1489,6 +1489,7 @@ enable_sdbinst enable_secedit enable_servicemodelreg enable_services +enable_shutdown enable_spoolsv enable_start enable_svchost @@ -18166,6 +18167,7 @@ wine_fn_config_program secedit enable_secedit install wine_fn_config_program servicemodelreg enable_servicemodelreg install wine_fn_config_program services enable_services clean,install wine_fn_config_test programs/services/tests services.exe_test +wine_fn_config_program shutdown enable_shutdown install wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start clean,install wine_fn_config_program svchost enable_svchost install diff --git a/configure.ac b/configure.ac index 1e6bba3..b57ff6a 100644 --- a/configure.ac +++ b/configure.ac @@ -3484,6 +3484,7 @@ WINE_CONFIG_PROGRAM(secedit,,[install]) WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) WINE_CONFIG_PROGRAM(services,,[clean,install]) WINE_CONFIG_TEST(programs/services/tests) +WINE_CONFIG_PROGRAM(shutdown,,[install]) WINE_CONFIG_PROGRAM(spoolsv,,[install]) WINE_CONFIG_PROGRAM(start,,[clean,install]) WINE_CONFIG_PROGRAM(svchost,,[install]) diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in new file mode 100644 index 0000000..0014021 --- /dev/null +++ b/programs/shutdown/Makefile.in @@ -0,0 +1,5 @@ +MODULE = shutdown.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/shutdown/main.c b/programs/shutdown/main.c new file mode 100644 index 0000000..49f8d24 --- /dev/null +++ b/programs/shutdown/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Michael Müller + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shutdown); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Marcus Meissner : manpages: Markup fixes.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 0d06ebf5fb515e19cd9ec951dd9e49f6e678b35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d06ebf5fb515e19cd9ec951d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Mar 2 09:24:34 2016 +0100 manpages: Markup fixes. Reported by Eric S. Raymond. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.man.in | 50 ++++++++++++++++++++-------------------- programs/winedbg/winedbg.man.in | 2 +- tools/winemaker/winemaker.man.in | 1 - 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index 83328ae..23b3b58 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -24,25 +24,25 @@ Same as \fB/x\fR. \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\flp\fR" +.IP "\fBlp\fR" Reinstall the file if it is missing. -.IP "\flo\fR" +.IP "\fBlo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fle\fR" +.IP "\fBle\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fld\fR" +.IP "\fBld\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\flc\fR" +.IP "\fBlc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fla\fR" +.IP "\fBla\fR" Reinstall all files. -.IP "\flu\fR" +.IP "\fBlu\fR" Rewrite all required user registry entries. -.IP "\flm\fR" +.IP "\fBlm\fR" Rewrite all required machine registry entries. -.IP "\fls\fR" +.IP "\fBls\fR" Overwrite any conflicting shortcuts. -.IP "\flv\fR" +.IP "\fBlv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ Shows a full UI. [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fl*\fR" +.IP "\fBl*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fli\fR" +.IP "\fBli\fR" Log status messages. -.IP "\flw\fR" +.IP "\fBlw\fR" Log nonfatal warnings. -.IP "\fle\fR" +.IP "\fBle\fR" Log all error messages. -.IP "\fla\fR" +.IP "\fBla\fR" Log start of actions. -.IP "\flr\fR" +.IP "\fBlr\fR" Log action specifc records. -.IP "\flu\fR" +.IP "\fBlu\fR" Log user requests. -.IP "\flc\fR" +.IP "\fBlc\fR" Log initial UI parameters. -.IP "\flm\fR" +.IP "\fBlm\fR" Log out of memory errors. -.IP "\flo\fR" +.IP "\fBlo\fR" Log out of diskspace messages. -.IP "\flp \fR" +.IP "\fBlp \fR" Log terminal properties. -.IP "\flv \fR" +.IP "\fBlv \fR" Verbose logging. -.IP "\flx \fR" +.IP "\fBlx \fR" Log extra debugging messages. -.IP "\fl+ \fR" +.IP "\fBl+ \fR" Append logging to existing file. -.IP "\fl! \fR" +.IP "\fBl! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index d6e5dc9..d107166 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -163,7 +163,7 @@ Adds a breakpoint at the line \fIN\fR inside symbol \fIid\fR. .IP \fBbreak\ \fIN\fR Adds a breakpoint at line \fIN\fR of current source file. .IP \fBbreak\fR -Adds a breakpoint at current \f$PC\fR address. +Adds a breakpoint at current \fB$PC\fR address. .IP \fBwatch\ *\ \fIN\fR Adds a watch command (on write) at address \fIN\fR (on 4 bytes). .IP \fBwatch\ \fIid\fR diff --git a/tools/winemaker/winemaker.man.in b/tools/winemaker/winemaker.man.in index 5014cdd..9d03e65 100644 --- a/tools/winemaker/winemaker.man.in +++ b/tools/winemaker/winemaker.man.in @@ -29,7 +29,6 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "]

1 0

Matteo Bruni : opengl32: Move a TRACE to the proper place.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 5c77426d7fdf53d77cde517d34f2f8230d3332ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c77426d7fdf53d77cde517d3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:50:05 2016 +0100 opengl32: Move a TRACE to the proper place. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index f3f78ef..f4601dd 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1769,6 +1769,9 @@ static GLubyte *filter_extensions_list(const char *extensions, const char *disab p = str = HeapAlloc(GetProcessHeap(), 0, strlen(extensions) + 2); if (!str) return NULL; + + TRACE( "GL_EXTENSIONS:\n" ); + for (;;) { while (*extensions == ' ') @@ -1817,6 +1820,9 @@ static GLuint *filter_extensions_index(const char *disabled) disabled_exts = HeapAlloc(GetProcessHeap(), 0, disabled_size * sizeof(*disabled_exts)); if (!disabled_exts) return NULL; + + TRACE( "GL_EXTENSIONS:\n" ); + for (j = 0; j < extensions_count; ++j) { gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, j); @@ -1863,8 +1869,6 @@ static BOOL filter_extensions(const char *extensions, GLubyte **exts_list, GLuin { static const char *disabled; - TRACE( "GL_EXTENSIONS:\n" ); - if (!disabled) { HKEY hkey;

1 0

Matteo Bruni : makedep: Use an unsigned constant in hash_filename.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 5cb8f0d0dd7684e67069013e57be4b9aa4b4c1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb8f0d0dd7684e67069013e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:53:58 2016 +0100 makedep: Use an unsigned constant in hash_filename. This fixes a "warning: this decimal constant is unsigned only in ISO C90" with gcc 4.9.3. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 298ec04..8cbba1b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -729,7 +729,7 @@ static char *get_line( FILE *file ) static unsigned int hash_filename( const char *name ) { /* FNV-1 hash */ - unsigned int ret = 2166136261; + unsigned int ret = 2166136261u; while (*name) ret = (ret * 16777619) ^ *name++; return ret % HASH_SIZE; }

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_StretchRect().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 4917b987531b6fd64cc2c1dfe27050f141919e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4917b987531b6fd64cc2c1dfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:42 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_StretchRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bd94712..718de91 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1335,17 +1335,15 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); + struct wined3d_sub_resource_desc src_desc, dst_desc; HRESULT hr = D3DERR_INVALIDCALL; - struct wined3d_resource_desc src_desc, dst_desc; - struct wined3d_resource *sub_resource; RECT d, s; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", iface, src_surface, src_rect, dst_surface, dst_rect, filter); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &dst_desc); + wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc); if (!dst_rect) { d.left = 0; @@ -1355,8 +1353,7 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect dst_rect = &d; } - sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &src_desc); + wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc); if (!src_rect) { s.left = 0;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_ColorFill().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: fc87c40c3ed3294b3e6efcd3a2f86603fcec6b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc87c40c3ed3294b3e6efcd3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:43 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_ColorFill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 718de91..918e1e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1416,20 +1416,19 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, }; struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *surface_impl = unsafe_impl_from_IDirect3DSurface9(surface); - struct wined3d_resource *wined3d_resource; - struct wined3d_resource_desc desc; + struct wined3d_sub_resource_desc desc; HRESULT hr; TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color); wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_texture_get_sub_resource(surface_impl->wined3d_texture, surface_impl->sub_resource_idx))) + if (FAILED(wined3d_texture_get_sub_resource_desc(surface_impl->wined3d_texture, + surface_impl->sub_resource_idx, &desc))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - wined3d_resource_get_desc(wined3d_resource, &desc); if (desc.pool != WINED3D_POOL_DEFAULT) {

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_surface_GetDesc().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 7fad350ccfb91bf7921895d6e4e80423171764a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fad350ccfb91bf7921895d6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:44 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_surface_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index c3032dc..a0a1f27 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -207,18 +207,16 @@ static HRESULT WINAPI d3d9_surface_GetContainer(IDirect3DSurface9 *iface, REFIID static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_DESC *desc) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_volume_GetDesc().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 352667d439941712ab3efedd4b4590e04eea14ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=352667d439941712ab3efedd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:45 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_volume_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/volume.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 52502bf..d92f555 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -116,18 +116,16 @@ static HRESULT WINAPI d3d9_volume_GetContainer(IDirect3DVolume9 *iface, REFIID r static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DESC *desc) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(volume->wined3d_texture, volume->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Width = wined3d_desc.width;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_2d_GetLevelDesc().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 47c20218b7a57b65d0d2b6894a4c2d9d09f25e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c20218b7a57b65d0d2b6894… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:46 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_2d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 9cf10ae..cdb7193 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -285,21 +285,16 @@ static void WINAPI d3d9_texture_2d_GenerateMipSubLevels(IDirect3DTexture9 *iface static HRESULT WINAPI d3d9_texture_2d_GetLevelDesc(IDirect3DTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type;

1 0