April 2016 - Wine-Commits - list.winehq.org

Michael Müller : wbemprox/tests: Add initial tests for ASSOCIATORS query.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: df5388b977df7b822ea7cf53f73b538905629c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5388b977df7b822ea7cf53f… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 18 11:04:49 2016 +0200 wbemprox/tests: Add initial tests for ASSOCIATORS query. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 9dc0db4..c0889f9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -147,6 +147,29 @@ static void test_select( IWbemServices *services ) SysFreeString( query ); } +static void test_associators( IWbemServices *services ) +{ + static const WCHAR query1[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',0}; + static const WCHAR query2[] = + {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ', + 'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_', + 'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; + static const WCHAR *test[] = { query1, query2 }; + HRESULT hr; + IEnumWbemClassObject *result; + UINT i; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + hr = exec_query( services, test[i], &result ); + todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + if (result) IEnumWbemClassObject_Release( result ); + } +} + static void test_Win32_Service( IWbemServices *services ) { static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; @@ -1054,6 +1077,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_select( services ); + test_associators( services ); test_Win32_Bios( services ); test_Win32_Process( services ); test_Win32_Service( services );

1 0

Alistair Leslie-Hughes : inetcomm: Add MimeOleGetPropertySchema stub.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 9b8d63d168bd96e32b5de61cb20860cc96a26776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8d63d168bd96e32b5de61cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 15 07:50:47 2016 +0000 inetcomm: Add MimeOleGetPropertySchema stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 6 ++++++ include/mimeole.idl | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index 0c90b4d..86eb9bd 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -79,7 +79,7 @@ @ stdcall MimeOleGetInternat(ptr) @ stub MimeOleGetPropA @ stub MimeOleGetPropW -@ stub MimeOleGetPropertySchema +@ stdcall MimeOleGetPropertySchema(ptr) @ stub MimeOleGetRelatedSection @ stub MimeOleInetDateToFileTime @ stub MimeOleObjectFromMoniker diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8ca8b35..8aebb38 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3031,3 +3031,9 @@ HRESULT VirtualStream_create(IUnknown *outer, void **obj) return MimeOleCreateVirtualStream((IStream **)obj); } + +HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema) +{ + FIXME("(%p) stub\n", schema); + return E_NOTIMPL; +} diff --git a/include/mimeole.idl b/include/mimeole.idl index c10d8e0..65c0b42 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -1378,6 +1378,8 @@ cpp_quote("HRESULT WINAPI MimeEditCreateMimeDocument(IUnknown*,IMimeMessage*,DWO cpp_quote("HRESULT WINAPI MimeEditGetBackgroundImageUrl(IUnknown*,BSTR*);") cpp_quote("HRESULT WINAPI MimeEditDocumentFromStream(IStream*,REFIID,void**);") +cpp_quote("HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema**);") + cpp_quote("#ifdef __cplusplus") cpp_quote("}") cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : inetcomm: IMimeMessage has a HBODY_ROOT node by default.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 7a2e5b038d063704f187bb9d3742d1ad8248777c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2e5b038d063704f187bb9d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 14 10:11:14 2016 +0000 inetcomm: IMimeMessage has a HBODY_ROOT node by default. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 8 ++++++++ dlls/inetcomm/tests/mimeole.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index d63da8c..36c3ec9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1706,6 +1706,8 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) return E_FAIL; } + empty_body_list(&This->body_tree); + IStream_AddRef(pStm); This->stream = pStm; offsets.cbBoundaryStart = offsets.cbHeaderStart = 0; @@ -2544,6 +2546,8 @@ static const IMimeMessageVtbl MimeMessageVtbl = HRESULT MimeMessage_create(IUnknown *outer, void **obj) { MimeMessage *This; + MimeBody *mime_body; + body_t *root_body; TRACE("(%p, %p)\n", outer, obj); @@ -2564,6 +2568,10 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) list_init(&This->body_tree); This->next_index = 1; + mime_body = mimebody_create(); + root_body = new_body_entry(mime_body, This->next_index++, NULL); + list_add_head(&This->body_tree, &root_body->entry); + *obj = &This->IMimeMessage_iface; return S_OK; } diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 7e98563..2b6dee2 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -332,6 +332,27 @@ static void test_CreateMessage(void) IStream_Release(stream); } +void test_BindToObject(void) +{ + HRESULT hr; + IMimeMessage *msg; + IMimeBody *body; + ULONG count; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeMessage_CountBodies(msg, HBODY_ROOT, TRUE, &count); + ok(hr == S_OK, "ret %08x\n", hr); + ok(count == 1, "got %d\n", count); + + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + IMimeBody_Release(body); + + IMimeMessage_Release(msg); +} + START_TEST(mimeole) { OleInitialize(NULL); @@ -340,5 +361,6 @@ START_TEST(mimeole) test_CreateBody(); test_Allocator(); test_CreateMessage(); + test_BindToObject(); OleUninitialize(); }

1 0

Nikolay Sivov : comctl32/tests: Simplify static text data initialization.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: b7f1839583b33397a0fbcd3784968087c4ab776f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f1839583b33397a0fbcd378… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 16 11:36:09 2016 +0300 comctl32/tests: Simplify static text data initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 8245711..43fd175 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1080,15 +1080,13 @@ static void test_hdm_index_messages(HWND hParent) HWND hChild; int retVal, i, iSize; static const int lpiarray[2] = {1, 0}; - static int lpiarrayReceived[2]; - static char firstHeaderItem[] = "Name"; - static char secondHeaderItem[] = "Size"; - static char thirdHeaderItem[] = "Type"; - static char fourthHeaderItem[] = "Date Modified"; - static char *items[] = {firstHeaderItem, secondHeaderItem, thirdHeaderItem, fourthHeaderItem}; + static const char *item_texts[] = { + "Name", "Size", "Type", "Date Modified" + }; RECT rect; HDITEMA hdItem; char buffA[32]; + int array[2]; flush_sequences(sequences, NUM_MSG_SEQUENCES); hChild = create_custom_header_control(hParent, FALSE); @@ -1099,10 +1097,10 @@ static void test_hdm_index_messages(HWND hParent) ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + for (i = 0; i < sizeof(item_texts)/sizeof(item_texts[0]); i++) { hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; - hdItem.pszText = items[i]; + hdItem.pszText = (char*)item_texts[i]; hdItem.fmt = HDF_LEFT; hdItem.cxy = 80; @@ -1146,8 +1144,8 @@ static void test_hdm_index_messages(HWND hParent) ok_sequence(sequences, HEADER_SEQ_INDEX, getItem_seq, "getItem sequence testing", FALSE); /* check if the item is the right one */ - ok(!strcmp(hdItem.pszText, firstHeaderItem), "got wrong item %s, expected %s\n", - hdItem.pszText, firstHeaderItem); + ok(!strcmp(hdItem.pszText, item_texts[0]), "got wrong item %s, expected %s\n", + hdItem.pszText, item_texts[0]); expect(80, hdItem.cxy); iSize = SendMessageA(hChild, HDM_GETITEMCOUNT, 0, 0); @@ -1166,15 +1164,15 @@ static void test_hdm_index_messages(HWND hParent) retVal = SendMessageA(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray); ok(retVal == TRUE, "Setting header items order should return TRUE, got %d\n", retVal); - retVal = SendMessageA(hChild, HDM_GETORDERARRAY, iSize, (LPARAM) lpiarrayReceived); + retVal = SendMessageA(hChild, HDM_GETORDERARRAY, 2, (LPARAM) array); ok(retVal == TRUE, "Getting header items order should return TRUE, got %d\n", retVal); ok_sequence(sequences, HEADER_SEQ_INDEX, orderArray_seq, "set_get_orderArray sequence testing", FALSE); /* check if the array order is set correctly and the size of the array is correct. */ expect(2, iSize); - expect(lpiarray[0], lpiarrayReceived[0]); - expect(lpiarray[1], lpiarrayReceived[1]); + ok(lpiarray[0] == array[0], "got %d, expected %d\n", array[0], lpiarray[0]); + ok(lpiarray[1] == array[1], "got %d, expected %d\n", array[1], lpiarray[1]); hdItem.mask = HDI_FORMAT; hdItem.fmt = HDF_CENTER | HDF_STRING;

1 0

Stefan Dösinger : wined3d: Get rid of WINED3D_BUFFER_FLUSH.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: d3f8efe5465f2217aaac075845d342e85cba18fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f8efe5465f2217aaac07584… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 17 19:07:54 2016 +0200 wined3d: Get rid of WINED3D_BUFFER_FLUSH. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bf2e58d..ce4d9d7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -32,10 +32,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ #define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ -#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ -#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ -#define WINED3D_BUFFER_SYNC 0x20 /* There has been at least one synchronized map since the last preload. */ -#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ +#define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ +#define WINED3D_BUFFER_SYNC 0x10 /* There has been at least one synchronized map since the last preload. */ +#define WINED3D_BUFFER_APPLESYNC 0x20 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -176,8 +175,6 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine { GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); - This->flags |= WINED3D_BUFFER_FLUSH; - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)"); This->flags |= WINED3D_BUFFER_APPLESYNC; @@ -709,7 +706,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined GL_EXTCALL(glFlushMappedBufferRange(This->buffer_type_hint, start, len)); checkGLcall("glFlushMappedBufferRange"); } - else if (This->flags & WINED3D_BUFFER_FLUSH) + else if (This->flags & WINED3D_BUFFER_APPLESYNC) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(This->buffer_type_hint, start, len)); checkGLcall("glFlushMappedBufferRangeAPPLE"); @@ -1093,7 +1090,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) checkGLcall("glFlushMappedBufferRange"); } } - else if (buffer->flags & WINED3D_BUFFER_FLUSH) + else if (buffer->flags & WINED3D_BUFFER_APPLESYNC) { for (i = 0; i < buffer->modified_areas; ++i) {

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_download_data().
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: fe0342e64685ebf69343c3e219fb88039a5b4e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0342e64685ebf69343c3e21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:53 2016 +0200 wined3d: Use the texture dimension helpers in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dd3a27e..741bfa3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -991,7 +991,9 @@ static void surface_download_data(struct wined3d_surface *surface, const struct { wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, texture->resource.device->surface_alignment, - surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_level_pow2_width(texture, surface->texture_level), + wined3d_texture_get_level_pow2_height(texture, surface->texture_level), + &src_row_pitch, &src_slice_pitch); mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); } else

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_get_drawable_size().
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 38d35c29cef71a17960f5842ef11871a6f116b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d35c29cef71a17960f5842e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:51 2016 +0200 wined3d: Use the texture dimension helpers in surface_get_drawable_size(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e5bc4d4..cba70a4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -122,8 +122,8 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru /* The drawable size of an FBO target is the OpenGL texture size, * which is the power of two size. */ rt = context->current_rt.texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; - *width = rt->pow2Width; - *height = rt->pow2Height; + *width = wined3d_texture_get_level_pow2_width(rt->container, rt->texture_level); + *height = wined3d_texture_get_level_pow2_height(rt->container, rt->texture_level); } }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in context_find_fbo_entry().
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: e7031197a10ed33d209b850600aa571acc518f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7031197a10ed33d209b85060… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:49 2016 +0200 wined3d: Use the texture dimension helpers in context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 52 +++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3cd7c8c..e33d37e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -474,30 +474,30 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, DWORD color_location, DWORD ds_location) { const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int object_count = gl_info->limits.buffers + 1; + struct wined3d_texture *rt_texture, *ds_texture; struct fbo_entry *entry; - UINT object_count = gl_info->limits.buffers + 1; unsigned int i; if (depth_stencil && render_targets[0]) { - if (wined3d_texture_get_level_width(depth_stencil->container, depth_stencil->texture_level) - < wined3d_texture_get_level_width(render_targets[0]->container, render_targets[0]->texture_level) - || wined3d_texture_get_level_height(depth_stencil->container, depth_stencil->texture_level) - < wined3d_texture_get_level_height(render_targets[0]->container, render_targets[0]->texture_level)) + rt_texture = render_targets[0]->container; + ds_texture = depth_stencil->container; + + if (wined3d_texture_get_level_width(ds_texture, depth_stencil->texture_level) + < wined3d_texture_get_level_width(rt_texture, render_targets[0]->texture_level) + || wined3d_texture_get_level_height(ds_texture, depth_stencil->texture_level) + < wined3d_texture_get_level_height(rt_texture, render_targets[0]->texture_level)) { - WARN("Depth stencil is smaller than the primary color buffer, disabling\n"); + WARN("Depth stencil is smaller than the primary color buffer, disabling.\n"); depth_stencil = NULL; } - else if (depth_stencil->container->resource.multisample_type - != render_targets[0]->container->resource.multisample_type - || depth_stencil->container->resource.multisample_quality - != render_targets[0]->container->resource.multisample_quality) + else if (ds_texture->resource.multisample_type != rt_texture->resource.multisample_type + || ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality) { WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", - render_targets[0]->container->resource.multisample_type, - render_targets[0]->container->resource.multisample_quality, - depth_stencil->container->resource.multisample_type, - depth_stencil->container->resource.multisample_quality); + rt_texture->resource.multisample_type, rt_texture->resource.multisample_quality, + ds_texture->resource.multisample_type, ds_texture->resource.multisample_quality); depth_stencil = NULL; } else @@ -514,22 +514,26 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, { if (render_targets[i]) { - TRACE(" Color attachment %u: (%p) %s gl obj %u(%s) %ux%u %u samples.\n", - i, render_targets[i], debug_d3dformat(render_targets[i]->container->resource.format->id), + rt_texture = render_targets[i]->container; + TRACE(" Color attachment %u: %p format %s, %s %u, %ux%u, %u samples.\n", + i, render_targets[i], debug_d3dformat(rt_texture->resource.format->id), + context->fbo_key->rb_namespace & (1 << (i + 1)) ? "renderbuffer" : "texure", context->fbo_key->objects[i + 1].object, - context->fbo_key->rb_namespace & (1 << (i + 1)) ? "rb" : "texure", - render_targets[i]->pow2Width, render_targets[i]->pow2Height, - render_targets[i]->container->resource.multisample_type); + wined3d_texture_get_level_pow2_width(rt_texture, render_targets[i]->texture_level), + wined3d_texture_get_level_pow2_height(rt_texture, render_targets[i]->texture_level), + rt_texture->resource.multisample_type); } } if (depth_stencil) { - TRACE(" Depth attachment: (%p) %s gl obj %u(%s) %ux%u %u samples.\n", - depth_stencil, debug_d3dformat(depth_stencil->container->resource.format->id), + ds_texture = depth_stencil->container; + TRACE(" Depth attachment: %p format %s, %s %u, %ux%u, %u samples.\n", + depth_stencil, debug_d3dformat(ds_texture->resource.format->id), + context->fbo_key->rb_namespace & (1 << 0) ? "renderbuffer" : "texure", context->fbo_key->objects[0].object, - context->fbo_key->rb_namespace & (1 << 0) ? "rb" : "texure", - depth_stencil->pow2Width, depth_stencil->pow2Height, - depth_stencil->container->resource.multisample_type); + wined3d_texture_get_level_pow2_width(ds_texture, depth_stencil->texture_level), + wined3d_texture_get_level_pow2_height(ds_texture, depth_stencil->texture_level), + ds_texture->resource.multisample_type); } }

1 0

Matteo Bruni : d3dx9: Don't complain when overwriting effect object id 0.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: e7021c6a036be1aaa6bebc5b01f8c780f4b7e517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7021c6a036be1aaa6bebc5b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 17 19:15:17 2016 +0200 d3dx9: Don't complain when overwriting effect object id 0. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5753683..aa939a1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4764,10 +4764,17 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } -static HRESULT d3dx9_copy_data(struct d3dx_object *object, const char **ptr) +static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int object_id, const char **ptr) { + struct d3dx_object *object = &base->objects[object_id]; + if (object->size || object->data) - FIXME("Object already initialized!\n"); + { + if (object_id) + FIXME("Overwriting object id %u!\n", object_id); + else + TRACE("Overwriting object id 0.\n"); + } read_dword(ptr, &object->size); TRACE("Data size: %#x\n", object->size); @@ -5570,7 +5577,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_VERTEXSHADER: case D3DXPT_PIXELSHADER: state->type = ST_CONSTANT; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; if (object->data) @@ -5586,7 +5593,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_FLOAT: case D3DXPT_STRING: state->type = ST_FXLC; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; d3dx_create_param_eval(base, object->data, object->size, param->type, &param->param_eval); break; @@ -5599,7 +5606,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 1: state->type = ST_PARAMETER; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); @@ -5627,7 +5634,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 2: state->type = ST_ARRAY_SELECTOR; - if (FAILED(hr = d3dx9_copy_data(object, ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; hr = d3dx9_parse_array_selector(base, param); break; @@ -5727,7 +5734,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da read_dword(&ptr, &id); TRACE("Id: %u\n", id); - if (FAILED(hr = d3dx9_copy_data(&base->objects[id], &ptr))) + if (FAILED(hr = d3dx9_copy_data(base, id, &ptr))) goto err_out; if (base->objects[id].data)

1 0

Francois Gouget : d3dx9_36/tests: Fix an unknown spelling error in the shader tests.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: a6745afc540d4a19d96ebf92c22262efe49fb8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6745afc540d4a19d96ebf92c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 17 20:05:32 2016 +0200 d3dx9_36/tests: Fix an unknown spelling error in the shader tests. 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/tests/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 694540c..4a7ae67 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -554,7 +554,7 @@ static void test_get_shader_constant_table_ex(void) ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); hr = ID3DXConstantTable_GetConstantDesc(constant_table, constant, &constant_desc, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant unknow", &constant_desc, &nb); + hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant unknown", &constant_desc, &nb); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant3", &constant_desc, &nb); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr);

1 0