November 2013 - Wine-commits

Nikolay Sivov : msctf: Fix some interface casts left from cleanup.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: f2b29ecf7201e0bd4d84ec5d3c4be3888f886350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b29ecf7201e0bd4d84ec5d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 19 16:14:45 2013 +0400 msctf: Fix some interface casts left from cleanup. --- dlls/msctf/categorymgr.c | 11 +++++------ dlls/msctf/compartmentmgr.c | 14 +++++++------- dlls/msctf/context.c | 8 ++++---- dlls/msctf/displayattributemgr.c | 9 ++++----- dlls/msctf/documentmgr.c | 29 +++++++++++++---------------- dlls/msctf/inputprocessor.c | 12 ++++++------ dlls/msctf/langbarmgr.c | 4 ++-- dlls/msctf/range.c | 2 +- 8 files changed, 42 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2b29ecf7201e0bd4d84e…

1 0

Michael Müller : quartz: Partial implementation of VMR7MonitorConfig and VMR9MonitorConfig.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 815f252b4a91bf83e69ae8b69defaafe6f7c68a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815f252b4a91bf83e69ae8b69… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 12 20:07:29 2013 +0100 quartz: Partial implementation of VMR7MonitorConfig and VMR9MonitorConfig. --- dlls/quartz/vmr9.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 140 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index dc6b4fc..31f3f8e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1285,6 +1285,74 @@ static const IVMRFilterConfigVtbl VMR7_FilterConfig_Vtbl = VMR7FilterConfig_GetRenderingMode }; +struct get_available_monitors_args +{ + VMRMONITORINFO *info7; + VMR9MonitorInfo *info9; + DWORD arraysize; + DWORD numdev; +}; + +static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) +{ + struct get_available_monitors_args *args = (struct get_available_monitors_args *)lparam; + MONITORINFOEXW mi; + + if (args->info7 || args->info9) + { + + if (!args->arraysize) + return FALSE; + + mi.cbSize = sizeof(mi); + if (!GetMonitorInfoW(hmon, (MONITORINFO*)&mi)) + return TRUE; + + /* fill VMRMONITORINFO struct */ + if (args->info7) + { + VMRMONITORINFO *info = args->info7++; + memset(info, 0, sizeof(*info)); + + info->guid.pGUID = NULL; /* FIXME */ + CopyRect(&info->rcMonitor, &mi.rcMonitor); + info->hMon = hmon; + info->dwFlags = mi.dwFlags; + + lstrcpynW(info->szDevice, mi.szDevice, sizeof(info->szDevice)/sizeof(WCHAR)); + + /* FIXME: how to get these values? */ + info->szDescription[0] = 0; + } + + /* fill VMR9MonitorInfo struct */ + if (args->info9) + { + VMR9MonitorInfo *info = args->info9++; + memset(info, 0, sizeof(*info)); + + info->uDevID = 0; /* FIXME */ + CopyRect(&info->rcMonitor, &mi.rcMonitor); + info->hMon = hmon; + info->dwFlags = mi.dwFlags; + + lstrcpynW(info->szDevice, mi.szDevice, sizeof(info->szDevice)/sizeof(WCHAR)); + + /* FIXME: how to get these values? */ + info->szDescription[0] = 0; + info->dwVendorId = 0; + info->dwDeviceId = 0; + info->dwSubSysId = 0; + info->dwRevision = 0; + } + + args->arraysize--; + } + + args->numdev++; + return TRUE; +} + static HRESULT WINAPI VMR7MonitorConfig_QueryInterface(IVMRMonitorConfig *iface, REFIID riid, LPVOID * ppv) { @@ -1309,7 +1377,11 @@ static HRESULT WINAPI VMR7MonitorConfig_SetMonitor(IVMRMonitorConfig *iface, con struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pGUID); - return E_NOTIMPL; + + if (!pGUID) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI VMR7MonitorConfig_GetMonitor(IVMRMonitorConfig *iface, VMRGUID *pGUID) @@ -1317,7 +1389,12 @@ static HRESULT WINAPI VMR7MonitorConfig_GetMonitor(IVMRMonitorConfig *iface, VMR struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pGUID); - return E_NOTIMPL; + + if (!pGUID) + return E_POINTER; + + pGUID->pGUID = NULL; /* default DirectDraw device */ + return S_OK; } static HRESULT WINAPI VMR7MonitorConfig_SetDefaultMonitor(IVMRMonitorConfig *iface, @@ -1326,7 +1403,11 @@ static HRESULT WINAPI VMR7MonitorConfig_SetDefaultMonitor(IVMRMonitorConfig *ifa struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pGUID); - return E_NOTIMPL; + + if (!pGUID) + return E_POINTER; + + return S_OK; } static HRESULT WINAPI VMR7MonitorConfig_GetDefaultMonitor(IVMRMonitorConfig *iface, VMRGUID *pGUID) @@ -1334,7 +1415,12 @@ static HRESULT WINAPI VMR7MonitorConfig_GetDefaultMonitor(IVMRMonitorConfig *ifa struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, pGUID); - return E_NOTIMPL; + + if (!pGUID) + return E_POINTER; + + pGUID->pGUID = NULL; /* default DirectDraw device */ + return S_OK; } static HRESULT WINAPI VMR7MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig *iface, @@ -1342,9 +1428,24 @@ static HRESULT WINAPI VMR7MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig * DWORD *numdev) { struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface); + struct get_available_monitors_args args; - FIXME("(%p/%p)->(%p, %u, %p) stub\n", iface, This, info, arraysize, numdev); - return E_NOTIMPL; + FIXME("(%p/%p)->(%p, %u, %p) semi-stub\n", iface, This, info, arraysize, numdev); + + if (!numdev) + return E_POINTER; + + if (info && arraysize == 0) + return E_INVALIDARG; + + args.info7 = info; + args.info9 = NULL; + args.arraysize = arraysize; + args.numdev = 0; + EnumDisplayMonitors(NULL, NULL, get_available_monitors_proc, (LPARAM)&args); + + *numdev = args.numdev; + return S_OK; } static const IVMRMonitorConfigVtbl VMR7_MonitorConfig_Vtbl = @@ -1383,7 +1484,8 @@ static HRESULT WINAPI VMR9MonitorConfig_SetMonitor(IVMRMonitorConfig9 *iface, UI struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); FIXME("(%p/%p)->(%u) stub\n", iface, This, uDev); - return E_NOTIMPL; + + return S_OK; } static HRESULT WINAPI VMR9MonitorConfig_GetMonitor(IVMRMonitorConfig9 *iface, UINT *uDev) @@ -1391,7 +1493,12 @@ static HRESULT WINAPI VMR9MonitorConfig_GetMonitor(IVMRMonitorConfig9 *iface, UI struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, uDev); - return E_NOTIMPL; + + if (!uDev) + return E_POINTER; + + *uDev = 0; + return S_OK; } static HRESULT WINAPI VMR9MonitorConfig_SetDefaultMonitor(IVMRMonitorConfig9 *iface, UINT uDev) @@ -1399,7 +1506,8 @@ static HRESULT WINAPI VMR9MonitorConfig_SetDefaultMonitor(IVMRMonitorConfig9 *if struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); FIXME("(%p/%p)->(%u) stub\n", iface, This, uDev); - return E_NOTIMPL; + + return S_OK; } static HRESULT WINAPI VMR9MonitorConfig_GetDefaultMonitor(IVMRMonitorConfig9 *iface, UINT *uDev) @@ -1407,7 +1515,12 @@ static HRESULT WINAPI VMR9MonitorConfig_GetDefaultMonitor(IVMRMonitorConfig9 *if struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); FIXME("(%p/%p)->(%p) stub\n", iface, This, uDev); - return E_NOTIMPL; + + if (!uDev) + return E_POINTER; + + *uDev = 0; + return S_OK; } static HRESULT WINAPI VMR9MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig9 *iface, @@ -1415,9 +1528,24 @@ static HRESULT WINAPI VMR9MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig9 DWORD *numdev) { struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface); + struct get_available_monitors_args args; - FIXME("(%p/%p)->(%p, %u, %p) stub\n", iface, This, info, arraysize, numdev); - return E_NOTIMPL; + FIXME("(%p/%p)->(%p, %u, %p) semi-stub\n", iface, This, info, arraysize, numdev); + + if (!numdev) + return E_POINTER; + + if (info && arraysize == 0) + return E_INVALIDARG; + + args.info7 = NULL; + args.info9 = info; + args.arraysize = arraysize; + args.numdev = 0; + EnumDisplayMonitors(NULL, NULL, get_available_monitors_proc, (LPARAM)&args); + + *numdev = args.numdev; + return S_OK; } static const IVMRMonitorConfig9Vtbl VMR9_MonitorConfig_Vtbl =

1 0

Akira Nakagawa : advapi32: Remove extra comma.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 55928a90e562783b46ce6a9253540c7eb8e851d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55928a90e562783b46ce6a925… Author: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Sun Nov 10 21:18:47 2013 +0900 advapi32: Remove extra comma. --- dlls/advapi32/eventlog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 0922fff..528d81d 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -743,7 +743,7 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,): stub\n", RequestAddress, RequestContext, + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); return ERROR_SUCCESS; @@ -762,7 +762,7 @@ ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,): stub\n", RequestAddress, RequestContext, + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), debugstr_a(MofResourceName), RegistrationHandle); return ERROR_SUCCESS;

1 0

Sebastian Lackner : winex11: Send XEMBED_REQUEST_FOCUS request for embedded windows.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 2e0ca3e74669b55f5d64b39e8fd32dc052652d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0ca3e74669b55f5d64b39e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 13 16:59:38 2013 +0100 winex11: Send XEMBED_REQUEST_FOCUS request for embedded windows. --- dlls/winex11.drv/event.c | 57 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 64188bc..767c003 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -183,6 +183,31 @@ static inline void free_event_data( XEvent *event ) } /*********************************************************************** + * xembed_request_focus + */ +static void xembed_request_focus( Display *display, Window window, DWORD timestamp ) +{ + XEvent xev; + + xev.xclient.type = ClientMessage; + xev.xclient.window = window; + xev.xclient.message_type = x11drv_atom(_XEMBED); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + + xev.xclient.data.l[0] = timestamp; + xev.xclient.data.l[1] = XEMBED_REQUEST_FOCUS; + xev.xclient.data.l[2] = 0; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + + XSendEvent(display, window, False, NoEventMask, &xev); + XFlush( display ); +} + +/*********************************************************************** * X11DRV_register_event_handler * * Register a handler for a given event type. @@ -532,14 +557,14 @@ static inline BOOL can_activate_window( HWND hwnd ) /********************************************************************** * set_input_focus * - * Try to force focus for non-managed windows. + * Try to force focus for embedded or non-managed windows. */ -static void set_input_focus( Display *display, Window window ) +static void set_input_focus( struct x11drv_win_data *data ) { XWindowChanges changes; DWORD timestamp; - if (!window) return; + if (!data->whole_window) return; if (EVENT_x11_time_to_win32_time(0)) /* ICCCM says don't use CurrentTime, so try to use last message time if possible */ @@ -550,8 +575,13 @@ static void set_input_focus( Display *display, Window window ) /* Set X focus and install colormap */ changes.stack_mode = Above; - XConfigureWindow( display, window, CWStackMode, &changes ); - XSetInputFocus( display, window, RevertToParent, timestamp ); + XConfigureWindow( data->display, data->whole_window, CWStackMode, &changes ); + + if (data->embedder) + xembed_request_focus( data->display, data->embedder, timestamp ); + else + XSetInputFocus( data->display, data->whole_window, RevertToParent, timestamp ); + } /********************************************************************** @@ -904,7 +934,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { HWND hwndFocus = GetFocus(); if (hwndFocus && IsChild( hwnd, hwndFocus )) - set_input_focus( data->display, data->whole_window ); + set_input_focus( data ); } release_win_data( data ); } @@ -1365,9 +1395,18 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) { struct x11drv_win_data *data; - if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; - if (!(data = get_win_data( hwnd ))) return; - if (!data->managed) set_input_focus( data->display, data->whole_window ); + HWND parent; + + for (;;) + { + if (!(data = get_win_data( hwnd ))) return; + if (data->embedded) break; + parent = GetAncestor( hwnd, GA_PARENT ); + if (!parent || parent == GetDesktopWindow()) break; + release_win_data( data ); + hwnd = parent; + } + if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); }

1 0

Detlef Riekenberg : wintrust/tests: Accept the CryptCATAdminAcquireContext win8 results.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 48ae4314d0c10cc827400d1a5f7f0531c199c88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ae4314d0c10cc827400d1a5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 17 15:18:26 2013 +0100 wintrust/tests: Accept the CryptCATAdminAcquireContext win8 results. --- dlls/wintrust/crypt.c | 2 +- dlls/wintrust/tests/crypt.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 0ed45d3..84188f8 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -113,7 +113,7 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin, TRACE("%p %s %x\n", catAdmin, debugstr_guid(sys), dwFlags); - if (!catAdmin) + if (!catAdmin || dwFlags) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index cb5818e..7f2fe76 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -284,13 +284,21 @@ static void test_context(void) ret = pCryptCATAdminReleaseContext(hca, 0); ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); - /* Flags not equal to 0 */ + hca = (void *) 0xdeadbeef; + SetLastError(0xdeadbeef); + /* Flags is documented as unused, but the parameter is checked since win8 */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); - ok(hca != NULL, "Expected a context handle, got NULL\n"); + ok((!ret && (GetLastError() == ERROR_INVALID_PARAMETER) && (hca == (void *) 0xdeadbeef)) || + broken(ret && hca != NULL && hca != (void *) 0xdeadbeef), + "Expected FALSE and ERROR_INVALID_PARAMETER with untouched handle, got %d and %u with %p\n", + ret, GetLastError(), hca); - ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + if (ret && hca) + { + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(hca, 0); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + } } /* TODO: Check whether SHA-1 is the algorithm that's always used */

1 0

Andrew Eikum : winmm: Also try MSACM conversions with WAVE_FORMAT_QUERY.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 06c95af45726674847d12440d904568f59f627bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c95af45726674847d12440d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 18 14:23:02 2013 -0600 winmm: Also try MSACM conversions with WAVE_FORMAT_QUERY. --- dlls/winmm/tests/wave.c | 15 ++++++++++- dlls/winmm/waveform.c | 66 +++++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06c95af45726674847d12…

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_add_dirty_rect().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: aa48321ccd5af82b074764524531d4db140928d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa48321ccd5af82b074764524… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:46 2013 +0100 wined3d: Surfaces always have a container in surface_add_dirty_rect(). --- dlls/wined3d/surface.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7718186..2999e62 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2421,12 +2421,7 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3 surface->dirtyRect.bottom = surface->resource.height; } - /* if the container is a texture then mark it dirty. */ - if (surface->container) - { - TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container); - } + wined3d_texture_set_dirty(surface->container); } HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb)

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_internal_preload().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 57292f94987e5dacad0d1458731b41e12e1d58a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57292f94987e5dacad0d14587… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:47 2013 +0100 wined3d: Surfaces always have a container in surface_internal_preload(). --- dlls/wined3d/surface.c | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2999e62..20b5c5f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3635,29 +3635,11 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined void surface_internal_preload(struct wined3d_surface *surface, struct wined3d_context *context, enum WINED3DSRGB srgb) { - TRACE("iface %p, srgb %#x.\n", surface, srgb); - - if (surface->container) - { - struct wined3d_texture *texture = surface->container; - - TRACE("Passing to container (%p).\n", texture); - texture->texture_ops->texture_preload(texture, context, srgb); - } - else - { - TRACE("(%p) : About to load surface\n", surface); + struct wined3d_texture *texture = surface->container; - surface_load(surface, srgb == SRGB_SRGB); + TRACE("iface %p, srgb %#x.\n", surface, srgb); - if (surface->resource.pool == WINED3D_POOL_DEFAULT) - { - /* Tell opengl to try and keep this texture in video ram (well mostly) */ - GLclampf tmp; - tmp = 0.9f; - context->gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &surface->texture_name, &tmp); - } - } + texture->texture_ops->texture_preload(texture, context, srgb); } /* Read the framebuffer back into the surface */

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_prepare_texture().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 2d262b3c9718a8a1ba522e8bd37c685905dbeb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d262b3c9718a8a1ba522e8bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:48 2013 +0100 wined3d: Surfaces always have a container in surface_prepare_texture(). --- dlls/wined3d/surface.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20b5c5f..f054b43 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3940,24 +3940,19 @@ static void surface_prepare_texture_internal(struct wined3d_surface *surface, /* Context activation is done by the caller. */ void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - if (surface->container) - { - struct wined3d_texture *texture = surface->container; - UINT sub_count = texture->level_count * texture->layer_count; - UINT i; - - TRACE("surface %p is a subresource of texture %p.\n", surface, texture); + struct wined3d_texture *texture = surface->container; + UINT sub_count = texture->level_count * texture->layer_count; + UINT i; - for (i = 0; i < sub_count; ++i) - { - struct wined3d_surface *s = surface_from_resource(texture->sub_resources[i]); - surface_prepare_texture_internal(s, context, srgb); - } + TRACE("surface %p is a subresource of texture %p.\n", surface, texture); - return; + for (i = 0; i < sub_count; ++i) + { + struct wined3d_surface *s = surface_from_resource(texture->sub_resources[i]); + surface_prepare_texture_internal(s, context, srgb); } - surface_prepare_texture_internal(surface, context, srgb); + return; } void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample)

1 0

Henri Verbeet : wined3d: Surfaces always have a container in fb_copy_to_texture_direct().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: f020251d2b51b099870ca37a283a2c4744cf4e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f020251d2b51b099870ca37a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:49 2013 +0100 wined3d: Surfaces always have a container in fb_copy_to_texture_direct(). --- dlls/wined3d/surface.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f054b43..a0ca8ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4289,12 +4289,6 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; - GLenum dst_target; - - if (dst_surface->container) - dst_target = dst_surface->container->target; - else - dst_target = dst_surface->texture_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -4312,7 +4306,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc surface_internal_preload(dst_surface, context, SRGB_RGB); /* Bind the target texture */ - context_bind_texture(context, dst_target, dst_surface->texture_name); + context_bind_texture(context, dst_surface->container->target, dst_surface->texture_name); if (surface_is_offscreen(src_surface)) { TRACE("Reading from an offscreen target\n");

1 0