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

Jacek Caban : jscript: Store current scope chain in call_frame_t.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 49ecfa950b207c97155dc285d5456e7caf74cb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ecfa950b207c97155dc285d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:04:13 2016 +0100 jscript: Store current scope chain in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 47 ++++++++++++++++++++++------------------------- dlls/jscript/engine.h | 9 +++++---- dlls/jscript/function.c | 8 ++++---- dlls/jscript/global.c | 5 +++-- dlls/jscript/jscript.c | 8 ++++---- 5 files changed, 38 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49ecfa950b207c97155dc…

1 0

Jacek Caban : jscript: Store entry scope chain in call_frame_t.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 400435dbe394cebc93ff9af8e1950a54df18f82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=400435dbe394cebc93ff9af8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:04:19 2016 +0100 jscript: Store entry scope chain in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 8 +++----- dlls/jscript/engine.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3492bb0..9bf1bfb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2466,7 +2466,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - scope_chain_t *prev_scope; call_frame_t *frame; jsop_t op; HRESULT hres = S_OK; @@ -2474,7 +2473,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t TRACE("\n"); frame = ctx->call_ctx; - prev_scope = frame->scope; while(frame->ip != -1) { op = frame->bytecode->instrs[frame->ip].op; @@ -2496,13 +2494,13 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t assert(ctx->call_ctx == frame); if(FAILED(hres)) { - while(frame->scope != prev_scope) + while(frame->scope != frame->base_scope) scope_pop(&frame->scope); stack_popn(exec_ctx, exec_ctx->top-frame->stack_base); } assert(exec_ctx->top == frame->stack_base); - assert(frame->scope == prev_scope); + assert(frame->scope == frame->base_scope); ctx->call_ctx = frame->prev_frame; release_call_frame(frame); @@ -2565,7 +2563,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->stack_base = ctx->top; if(scope) - frame->scope = scope_addref(scope); + frame->base_scope = frame->scope = scope_addref(scope); frame->exec_ctx = ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c46ca7c..82ff4ed 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -196,6 +196,7 @@ typedef struct _call_frame_t { except_frame_t *except_frame; unsigned stack_base; scope_chain_t *scope; + scope_chain_t *base_scope; bytecode_t *bytecode; function_code_t *function;

1 0

Paul Gofman : wined3d: Support D3DFMT_L8 format as render target.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: d05edd03c43aa826738770910fd5f0a8c0a52b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05edd03c43aa826738770910… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 25 12:04:00 2016 +0300 wined3d: Support D3DFMT_L8 format as render target. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index df22e80..e5a3ee6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1262,15 +1262,16 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE, ARB_TEXTURE_RG, NULL}, /* Luminance */ - {WINED3DFMT_L8_UNORM, GL_R8, GL_R8, 0, - GL_RED, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - ARB_TEXTURE_RG, NULL}, {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_L8_UNORM, GL_R8, GL_R8, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_L8A8_UNORM, GL_RG8, GL_RG8, 0, GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, @@ -2921,9 +2922,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ idx = get_format_idx(WINED3DFMT_A8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_X); - idx = get_format_idx(WINED3DFMT_L8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_L8A8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); @@ -2938,6 +2936,13 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); } + if (gl_info->supported[ARB_TEXTURE_RG]) + { + idx = get_format_idx(WINED3DFMT_L8_UNORM); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); + } + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { idx = get_format_idx(WINED3DFMT_P8_UINT);

1 0

Andrew Eikum : winecoreaudio.drv: Ensure divide-by-zero SSE exceptions are masked before calling AudioConverterNew.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 8efa49375a92913be3db11c7028c8f7eabccfce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8efa49375a92913be3db11c70… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 25 08:26:11 2016 -0500 winecoreaudio.drv: Ensure divide-by-zero SSE exceptions are masked before calling AudioConverterNew. AudioConverterNew can trigger a divide-by-zero exception. Normally this is masked by the default SSE mask flags. However, iRacing disables this mask, leading to a crash when it tries to initialize a recording device. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 9f9fd0d..8316d65 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -36,6 +36,7 @@ #include <sys/stat.h> #include <sys/ioctl.h> #include <fcntl.h> +#include <fenv.h> #include <unistd.h> #include <libkern/OSAtomic.h> @@ -1233,6 +1234,8 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni AudioStreamBasicDescription desc; UInt32 size; Float64 rate; + fenv_t fenv; + BOOL fenv_stored = TRUE; hr = ca_get_audiodesc(&desc, fmt); if(FAILED(hr)) @@ -1262,7 +1265,17 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni return osstatus_to_hresult(sc); } + /* AudioConverterNew requires divide-by-zero SSE exceptions to be masked */ + if(feholdexcept(&fenv)){ + WARN("Failed to store fenv state\n"); + fenv_stored = FALSE; + } + sc = AudioConverterNew(dev_desc, &desc, converter); + + if(fenv_stored && fesetenv(&fenv)) + WARN("Failed to restore fenv state\n"); + if(sc != noErr){ WARN("Couldn't create audio converter: %x\n", (int)sc); return osstatus_to_hresult(sc);

1 0

André Hentschel : shell32: Provide helper function a buffer of correct size.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 1010372778978a30fb7f9d36d51c0cdacfb1c2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1010372778978a30fb7f9d36d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 23 20:25:12 2016 +0100 shell32: Provide helper function a buffer of correct size. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 5fcbe03..6aa3eec 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1087,6 +1087,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR { UINT_PTR retval = SE_ERR_NOASSOC; WCHAR old_dir[1024]; + WCHAR res[MAX_PATH]; TRACE("File %s, Dir %s\n", debugstr_w(lpFile), debugstr_w(lpDirectory)); @@ -1100,7 +1101,10 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR SetCurrentDirectoryW(lpDirectory); } - retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, lpResult, MAX_PATH, NULL, NULL, NULL, NULL); + retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, res, MAX_PATH, NULL, NULL, NULL, NULL); + + if (retval > 32) + strcpyW(lpResult, res); TRACE("returning %s\n", debugstr_w(lpResult)); if (lpDirectory)

1 0

Ken Thomases : user32: Call the EnumDisplayMonitors callback using a wrapper.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 474196c746e95cf84137a85512d01a0e622c5c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474196c746e95cf84137a8551… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 23 21:46:32 2016 -0500 user32: Call the EnumDisplayMonitors callback using a wrapper. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 071230e..109809f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -466,11 +468,46 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) return ret; } +#ifdef __i386__ +/* Some apps pass a non-stdcall callback to EnumDisplayMonitors, + * so we need a small assembly wrapper to call it. + */ +struct enumdisplaymonitors_lparam +{ + MONITORENUMPROC proc; + LPARAM lparam; +}; + +extern BOOL CALLBACK enumdisplaymonitors_callback_wrapper(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam); +__ASM_STDCALL_FUNC( enumdisplaymonitors_callback_wrapper, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $8,%esp\n\t" + "movl 20(%ebp),%eax\n\t" /* struct enumdisplaymonitors_lparam *orig = (struct enumdisplaymonitors_lparam*)lparam */ + "pushl 4(%eax)\n\t" /* push orig->lparam */ + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call *(%eax)\n\t" /* call orig->proc */ + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) +#endif /* __i386__ */ + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { +#ifdef __i386__ + struct enumdisplaymonitors_lparam orig = { proc, lp }; + proc = enumdisplaymonitors_callback_wrapper; + lp = (LPARAM)&orig; +#endif return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); }

1 0

Matteo Bruni : d3d11: Add a couple missing wined3d_mutex_unlock() in d3d_shader_resource_view_init() error paths.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: b0a9e0cebddf1a2446241b8e7bb3c791d48887cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a9e0cebddf1a2446241b8e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 14:26:22 2016 +0100 d3d11: Add a couple missing wined3d_mutex_unlock() in d3d_shader_resource_view_init() error paths. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 1d9b766..c4487d3 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1503,6 +1503,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi wined3d_mutex_lock(); if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource))) { + wined3d_mutex_unlock(); ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); return E_FAIL; } @@ -1510,6 +1511,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi if (FAILED(hr = wined3d_shader_resource_view_create(wined3d_resource, view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) { + wined3d_mutex_unlock(); WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr); return hr; }

1 0

Józef Kucia : d3d8: Avoid '\n' in middle of TRACE() messages.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 0aa885e75a38478a727882b079438fe08bd63627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa885e75a38478a727882b07… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:23 2016 +0100 d3d8: Avoid '\n' in middle of TRACE() messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1cad4be..154d817 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -942,8 +942,8 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width struct wined3d_texture *texture; HRESULT hr; - TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p,\n" - "\tusage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", + TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p, " + "usage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", device, width, height, format, flags, surface, usage, pool, multisample_type, multisample_quality); @@ -2130,7 +2130,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface UINT vtx_size = vertex_count * vertex_stride; UINT vb_pos, align; - TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u,\n" + TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride);

1 0

Józef Kucia : d3d9: Avoid '\n' in middle of TRACE() messages.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 1f8de0696f75632b34ad461b71865cc4995849d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8de0696f75632b34ad461b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:24 2016 +0100 d3d9: Avoid '\n' in middle of TRACE() messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 47f4f7b..bd9f935 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2314,7 +2314,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; - TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u,\n" + TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u, " "vertex_count %u, start_idx %u, primitive_count %u.\n", iface, primitive_type, base_vertex_idx, min_vertex_idx, vertex_count, start_idx, primitive_count); @@ -2339,13 +2339,13 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN UINT size = max(device->vertex_buffer_size * 2, min_size); struct wined3d_buffer *buffer; - TRACE("Growing vertex buffer to %u bytes\n", size); + TRACE("Growing vertex buffer to %u bytes.\n", size); hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x.\n", device, hr); return hr; } @@ -2423,13 +2423,13 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT UINT size = max(device->index_buffer_size * 2, min_size); struct wined3d_buffer *buffer; - TRACE("Growing index buffer to %u bytes\n", size); + TRACE("Growing index buffer to %u bytes.\n", size); hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x.\n", device, hr); return hr; } @@ -2460,14 +2460,14 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa UINT vtx_size = vertex_count * vertex_stride; UINT vb_pos, align; - TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u,\n" + TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); if (!primitive_count) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count is 0, returning D3D_OK.\n"); return D3D_OK; } @@ -3259,7 +3259,7 @@ static HRESULT WINAPI d3d9_device_ComposeRects(IDirect3DDevice9Ex *iface, IDirect3DSurface9 *src_surface, IDirect3DSurface9 *dst_surface, IDirect3DVertexBuffer9 *src_descs, UINT rect_count, IDirect3DVertexBuffer9 *dst_descs, D3DCOMPOSERECTSOP operation, INT offset_x, INT offset_y) { - FIXME("iface %p, src_surface %p, dst_surface %p, src_descs %p, rect_count %u,\n" + FIXME("iface %p, src_surface %p, dst_surface %p, src_descs %p, rect_count %u, " "dst_descs %p, operation %#x, offset_x %u, offset_y %u stub!\n", iface, src_surface, dst_surface, src_descs, rect_count, dst_descs, operation, offset_x, offset_y); @@ -3372,7 +3372,7 @@ static HRESULT WINAPI d3d9_device_CreateRenderTargetEx(IDirect3DDevice9Ex *iface UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n" + FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " "lockable %#x, surface %p, shared_handle %p, usage %#x stub!\n", iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage);

1 0

Józef Kucia : wined3d: Improve advertized driver version for Windows 10.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 4315caeff699325cd681b9beb7d22908b098411b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4315caeff699325cd681b9beb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:25 2016 +0100 wined3d: Improve advertized driver version for Windows 10. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02c8a26..6bf1247 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1151,7 +1151,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, - {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280 }, + {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp @@ -1514,6 +1514,11 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } break; + case 10: + driver_os_version = 10; + driver_model = DRIVER_MODEL_NT6X; + break; + default: FIXME("Unhandled OS version %u.%u, reporting 2000/XP.\n", os_version.dwMajorVersion, os_version.dwMinorVersion);

1 0