wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Jacek Caban : mshtml/tests: Fixed remaining xmlhttprequest test failures.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: f24526e79f1c57e559c3a35ab69b85dabc57d59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24526e79f1c57e559c3a35ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 10:31:14 2016 +0100 mshtml/tests: Fixed remaining xmlhttprequest test failures. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 3153804..7e75b79 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -566,7 +566,7 @@ static void test_responseXML(const char *expect_text) ok(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, "Expected supported: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got %08x\n", supported); - ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), + ok(enabled == ((INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) & supported), "Expected enabled: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got 0x%08x\n", enabled); IObjectSafety_Release(safety); @@ -585,9 +585,9 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Accept-Ranges", "bytes"}, + {"Accept-Ranges", "bytes", TRUE}, {"Content-Length", "51"}, - {"Content-Type", "application/xml", TRUE} + {"Content-Type", "application/xml"} }; trace("test_sync_xhr\n");

1 0

Alexandre Julliard : winebuild: Add a common helper to find an imported dll.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 59b5c52f1dc57cf7ef525d9d958e09684bb04e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b5c52f1dc57cf7ef525d9d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 16:50:44 2016 +0900 winebuild: Add a common helper to find an imported dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 69d4765..1d561c4 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -154,15 +154,15 @@ static int is_delayed_import( const char *name ) return 0; } -/* check whether a given dll has already been imported */ -static struct import *is_already_imported( const char *name ) +/* find an imported dll from its name */ +static struct import *find_import_dll( const char *name ) { struct import *import; LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) - if (!strcmp( import->dll_name, name )) return import; + if (!strcasecmp( import->dll_name, name )) return import; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) - if (!strcmp( import->dll_name, name )) return import; + if (!strcasecmp( import->dll_name, name )) return import; return NULL; } @@ -215,7 +215,7 @@ static DLLSPEC *read_import_lib( struct import *imp ) close_input_file( f ); /* check if we already imported that library from a different file */ - if ((prev_imp = is_already_imported( spec->file_name ))) + if ((prev_imp = find_import_dll( spec->file_name ))) { if (prev_imp->dev != imp->dev || prev_imp->ino != imp->ino) fatal_error( "%s and %s have the same export name '%s'\n", @@ -292,7 +292,7 @@ void add_delayed_import( const char *name ) char *fullname = get_dll_name( name, NULL ); strarray_add( &delayed_imports, fullname, NULL ); - if ((imp = is_already_imported( fullname ))) + if ((imp = find_import_dll( fullname ))) { list_remove( &imp->entry ); list_add_tail( &dll_delayed, &imp->entry ); @@ -389,25 +389,14 @@ static void check_undefined_forwards( DLLSPEC *spec ) api_name = p + 1; dll_name = get_dll_name( link_name, NULL ); - LIST_FOR_EACH_ENTRY( imp, &dll_imports, struct import, entry ) + if ((imp = find_import_dll( dll_name ))) { - if (strcasecmp( imp->dll_name, dll_name )) continue; if (!find_export( api_name, imp->exports, imp->nb_exports )) warning( "%s:%d: forward '%s' not found in %s\n", spec->src_name, odp->lineno, odp->link_name, imp->dll_name ); - goto done; } - LIST_FOR_EACH_ENTRY( imp, &dll_delayed, struct import, entry ) - { - if (strcasecmp( imp->dll_name, dll_name )) continue; - if (!find_export( api_name, imp->exports, imp->nb_exports )) - warning( "%s:%d: forward '%s' not found in %s\n", - spec->src_name, odp->lineno, odp->link_name, imp->dll_name ); - goto done; - } - warning( "%s:%d: forward '%s' not found in the imported dll list\n", - spec->src_name, odp->lineno, odp->link_name ); - done: + else warning( "%s:%d: forward '%s' not found in the imported dll list\n", + spec->src_name, odp->lineno, odp->link_name ); free( link_name ); free( dll_name ); }

1 0

Austin English : dwmapi: Add DwmSetPresentParameters stub.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: a717598b75b81f776e3fe51372651046cd24f955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a717598b75b81f776e3fe5137… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 28 17:45:17 2016 -0600 dwmapi: Add DwmSetPresentParameters stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ include/dwmapi.h | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 531f279..6adbcb9 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -39,7 +39,7 @@ @ stub DwmQueryThumbnailSourceSize @ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration -@ stub DwmSetPresentParameters +@ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) @ stdcall DwmUnregisterThumbnail(long) @ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index a776cfe..155d7d3 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -259,3 +259,12 @@ HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUM FIXME("(%p, %p) stub\n", thumbnail, props); return E_NOTIMPL; } + +/********************************************************************** + * DwmSetPresentParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params) +{ + FIXME("(%p %p) stub\n", hwnd, params); + return S_OK; +}; diff --git a/include/dwmapi.h b/include/dwmapi.h index 035c831..f5191e1 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -37,6 +37,12 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +typedef enum _DWM_SOURCE_FRAME_SAMPLING { + DWM_SOURCE_FRAME_SAMPLING_POINT, + DWM_SOURCE_FRAME_SAMPLING_COVERAGE, + DWM_SOURCE_FRAME_SAMPLING_LAST +} DWM_SOURCE_FRAME_SAMPLING; + typedef struct _UNSIGNED_RATIO { UINT32 uiNumerator; UINT32 uiDenominator; @@ -117,6 +123,17 @@ typedef struct _DWM_THUMBNAIL_PROPERTIES BOOL fSourceClientAreaOnly; } DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; +typedef struct _DWM_PRESENT_PARAMETERS { + UINT32 cbSize; + BOOL fQueue; + DWM_FRAME_COUNT cRefreshStart; + UINT cBuffer; + BOOL fUseSourceRate; + UNSIGNED_RATIO rateSource; + UINT cRefreshesPerFrame; + DWM_SOURCE_FRAME_SAMPLING eSampling; +} DWM_PRESENT_PARAMETERS; + #include <poppack.h> DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); @@ -129,6 +146,7 @@ DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *);

1 0

Austin English : mgmtapi: Add SnmpMgrTrapListen stub.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 157a647c4606f7bfb8816234a0f9d00de2c34dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157a647c4606f7bfb8816234a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 17:42:45 2016 -0500 mgmtapi: Add SnmpMgrTrapListen stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mgmtapi/mgmtapi.c | 7 +++++++ dlls/mgmtapi/mgmtapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mgmtapi/mgmtapi.c b/dlls/mgmtapi/mgmtapi.c index fd6cdf9..06c540a 100644 --- a/dlls/mgmtapi/mgmtapi.c +++ b/dlls/mgmtapi/mgmtapi.c @@ -37,3 +37,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +BOOL WINAPI SnmpMgrTrapListen(HANDLE *available) +{ + FIXME("stub: %p\n", available); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/mgmtapi/mgmtapi.spec b/dlls/mgmtapi/mgmtapi.spec index a052d73..e675e2d 100644 --- a/dlls/mgmtapi/mgmtapi.spec +++ b/dlls/mgmtapi/mgmtapi.spec @@ -6,4 +6,4 @@ @ stub SnmpMgrOpen @ stub SnmpMgrRequest @ stub SnmpMgrStrToOid -@ stub SnmpMgrTrapListen +@ stdcall SnmpMgrTrapListen(ptr)

1 0

Austin English : crypt32: Add CryptMsgVerifyCountersignatureEncoded stub.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 9fd90749c2c635573c234aba7b92064f7bc5ffc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd90749c2c635573c234aba7… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 16:19:18 2016 -0500 crypt32: Add CryptMsgVerifyCountersignatureEncoded stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index e639d7c..0d2a477 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -160,7 +160,7 @@ @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) @ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr) @ stdcall CryptMsgUpdate(ptr ptr long long) -@ stub CryptMsgVerifyCountersignatureEncoded +@ stdcall CryptMsgVerifyCountersignatureEncoded(ptr long ptr long ptr long ptr) @ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) @ stdcall CryptProtectMemory(ptr long long) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 13f5934..80b2de7 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3737,6 +3737,17 @@ BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, return ret; } +BOOL WINAPI CryptMsgVerifyCountersignatureEncoded(HCRYPTPROV_LEGACY hCryptProv, + DWORD dwEncodingType, BYTE *pbSignerInfo, DWORD cbSignerInfo, + PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature, + CERT_INFO *pciCountersigner) +{ + FIXME("(%08lx, %08x, %p, %d, %p, %d, %p): stub\n", hCryptProv, + dwEncodingType, pbSignerInfo, cbSignerInfo, pbSignerInfoCountersignature, + cbSignerInfoCountersignature, pciCountersigner); + return FALSE; +} + BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv, DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,

1 0

Francois Gouget : d3dx9_36: Make d3dx_set_shader_const_state() static.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: f030fbe0a29a0f6a6756ebc579172c1e83f9d58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f030fbe0a29a0f6a6756ebc57… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:24:44 2016 +0100 d3dx9_36: Make d3dx_set_shader_const_state() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8f82784..a210bb3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2645,7 +2645,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma } } -HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTANT_TYPE op, UINT index, +static HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTANT_TYPE op, UINT index, struct d3dx_parameter *param, void *value_ptr) { static const struct

1 0

Paul Gofman : d3dx9: Add test for preshader in effect.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: ad7ec2ec14863c1b8fcf2db2bf7daf00a98035f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7ec2ec14863c1b8fcf2db2b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 21 16:55:52 2016 +0300 d3dx9: Add test for preshader in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 879 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 879 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad7ec2ec14863c1b8fcf2…

1 0

Stefan Dösinger : wined3d: Avoid storing a rectangle pointer in struct wined3d_cs_set_scissor_rect.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 8d8b4d9c66720228b57ec62b6489049ad6c11b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8b4d9c66720228b57ec62b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 22 17:46:13 2016 +0100 wined3d: Avoid storing a rectangle pointer in struct wined3d_cs_set_scissor_rect. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e36429d..6e7a57b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -101,7 +101,7 @@ struct wined3d_cs_set_viewport struct wined3d_cs_set_scissor_rect { enum wined3d_cs_op opcode; - const RECT *rect; + RECT rect; }; struct wined3d_cs_set_rendertarget_view @@ -374,7 +374,7 @@ static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void * { const struct wined3d_cs_set_scissor_rect *op = data; - cs->state.scissor_rect = *op->rect; + cs->state.scissor_rect = op->rect; device_invalidate_state(cs->device, STATE_SCISSORRECT); } @@ -384,7 +384,7 @@ void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; - op->rect = rect; + op->rect = *rect; cs->ops->submit(cs); }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_depth_blt().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 9868969211012f95f7034cbf0f22fd7423f76653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9868969211012f95f7034cbf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:12 2016 +0100 wined3d: Get resource info from the texture in surface_depth_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9840683..b86cb72 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2757,7 +2757,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE static void surface_depth_blt(const struct wined3d_surface *surface, struct wined3d_context *context, GLuint texture, GLint x, GLint y, GLsizei w, GLsizei h, GLenum target) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_device *device = surface->container->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; GLint compare_mode = GL_NONE; struct blt_info info;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_blt_special().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 6d823825faeeab73dea821c24060d3fd8ff5c817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d823825faeeab73dea821c24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:11 2016 +0100 wined3d: Get resource info from the texture in surface_blt_special(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4243de6..9840683 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2621,35 +2621,39 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { - struct wined3d_device *device = dst_surface->resource.device; + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_device *device = dst_texture->resource.device; const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); struct wined3d_swapchain *src_swapchain, *dst_swapchain; + struct wined3d_texture *src_texture; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); /* Get the swapchain. One of the surfaces has to be a primary surface */ - if (dst_surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) { WARN("Destination is in sysmem, rejecting gl blt\n"); return WINED3DERR_INVALIDCALL; } - dst_swapchain = dst_surface->container->swapchain; + dst_swapchain = dst_texture->swapchain; if (src_surface) { - if (src_surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) + src_texture = src_surface->container; + if (src_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) { WARN("Src is in sysmem, rejecting gl blt\n"); return WINED3DERR_INVALIDCALL; } - src_swapchain = src_surface->container->swapchain; + src_swapchain = src_texture->swapchain; } else { + src_texture = NULL; src_swapchain = NULL; } @@ -2698,8 +2702,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE BOOL stretchx; /* P8 read back is not implemented */ - if (src_surface->resource.format->id == WINED3DFMT_P8_UINT - || dst_surface->resource.format->id == WINED3DFMT_P8_UINT) + if (src_texture->resource.format->id == WINED3DFMT_P8_UINT + || dst_texture->resource.format->id == WINED3DFMT_P8_UINT) { TRACE("P8 read back not supported by frame buffer to texture blit\n"); return WINED3DERR_INVALIDCALL;

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016