October 2015 - Wine-commits

Jacek Caban : mshtml/tests: Fixed more test failures on win10.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 79c59085b1b1f487e91c2695028dd3d1d257a468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c59085b1b1f487e91c26950… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 14:49:18 2015 +0100 mshtml/tests: Fixed more test failures on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0e7781b..89834ac 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -872,7 +872,12 @@ static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(riid, &IID_INewWindowManager)) { + *ppv = iface; + return S_OK; + } + + trace("NewWindowManager_QueryInterface %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -2873,8 +2878,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { - if(nCmdID != 63 && nCmdID != 178 && (!is_refresh || nCmdID != 37)) - test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2888,6 +2891,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID test_readyState(NULL); load_state = LD_LOADING; }else { + if(!is_refresh) + test_readyState(NULL); if(nav_url) test_GetCurMoniker(doc_unk, NULL, nav_serv_url, FALSE); else if(load_from_stream) @@ -2951,6 +2956,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(pvaIn) ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut)=%d\n", V_VT(pvaOut)); + test_readyState(NULL); return E_NOTIMPL; case 103: @@ -2959,6 +2965,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 105: @@ -2967,12 +2974,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 138: CHECK_EXPECT2(Exec_ShellDocView_138); ok(!pvaIn, "pvaIn != NULL\n"); ok(!pvaOut, "pvaOut != NULL\n"); + test_readyState(NULL); return S_OK; case 140: @@ -2981,6 +2990,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn == NULL, "pvaIn != NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); + test_readyState(NULL); return E_NOTIMPL; case 83:

1 0

Huw Davies : riched20: Rewrite the picture destination parser to handle embedded groups.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: cfc891420096c8e999ee5b955d57b20742b768c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc891420096c8e999ee5b955… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:49:55 2015 +0000 riched20: Rewrite the picture destination parser to handle embedded groups. Since almost every line of ME_RTFReadPictGroup() changed, I took the opportunity to re-format it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 265 +++++++++++++++++++++++++++---------------------- 1 file changed, 145 insertions(+), 120 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ae4a3ab..31d134f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1236,136 +1236,161 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm return ret; } -static void ME_RTFReadPictGroup(RTF_Info *info) +static DWORD read_hex_data( RTF_Info *info, BYTE **out ) { - SIZEL sz; - BYTE* buffer = NULL; - unsigned bufsz, bufidx; - BOOL flip; - BYTE val; - METAFILEPICT mfp; - HENHMETAFILE hemf; - HBITMAP hbmp; - enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_metafile, gfx_dib} gfx = gfx_unknown; - - RTFGetToken (info); - if (info->rtfClass == rtfEOF) - return; - mfp.mm = MM_TEXT; - /* fetch picture type */ - if (RTFCheckMM (info, rtfPictAttr, rtfWinMetafile)) - { - mfp.mm = info->rtfParam; - gfx = gfx_metafile; - } - else if (RTFCheckMM (info, rtfPictAttr, rtfDevIndBitmap)) - { - if (info->rtfParam != 0) FIXME("dibitmap should be 0 (%d)\n", info->rtfParam); - gfx = gfx_dib; - } - else if (RTFCheckMM (info, rtfPictAttr, rtfEmfBlip)) - { - gfx = gfx_enhmetafile; - } - else - { - FIXME("%d %d\n", info->rtfMajor, info->rtfMinor); - goto skip_group; - } - sz.cx = sz.cy = 0; - /* fetch picture attributes */ - for (;;) - { - RTFGetToken (info); - if (info->rtfClass == rtfEOF) - return; - if (info->rtfClass == rtfText) - break; - if (!RTFCheckCM (info, rtfControl, rtfPictAttr)) - { - ERR("Expected picture attribute (%d %d)\n", - info->rtfClass, info->rtfMajor); - goto skip_group; - } - else if (RTFCheckMM (info, rtfPictAttr, rtfPicWid)) - { - if (gfx == gfx_metafile) mfp.xExt = info->rtfParam; - } - else if (RTFCheckMM (info, rtfPictAttr, rtfPicHt)) + DWORD read = 0, size = 1024; + BYTE *buf = HeapAlloc( GetProcessHeap(), 0, size ); + BYTE val; + BOOL flip; + + *out = NULL; + if (!buf) return 0; + + if (info->rtfClass != rtfText) { - if (gfx == gfx_metafile) mfp.yExt = info->rtfParam; + ERR("Called with incorrect token\n"); + return 0; } - else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalWid)) - sz.cx = info->rtfParam; - else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalHt)) - sz.cy = info->rtfParam; - else - FIXME("Non supported attribute: %d %d %d\n", info->rtfClass, info->rtfMajor, info->rtfMinor); - } - /* fetch picture data */ - bufsz = 1024; - bufidx = 0; - buffer = HeapAlloc(GetProcessHeap(), 0, bufsz); - val = info->rtfMajor; - for (flip = TRUE;; flip = !flip) - { - RTFGetToken (info); - if (info->rtfClass == rtfEOF) + + val = info->rtfMajor; + for (flip = TRUE;; flip = !flip) { - HeapFree(GetProcessHeap(), 0, buffer); - return; /* Warn ?? */ + RTFGetToken( info ); + if (info->rtfClass == rtfEOF) + { + HeapFree( GetProcessHeap(), 0, buf ); + return 0; + } + if (info->rtfClass != rtfText) break; + if (flip) + { + if (read >= size) + { + size *= 2; + buf = HeapReAlloc( GetProcessHeap(), 0, buf, size ); + if (!buf) return 0; + } + buf[read++] = RTFCharToHex(val) * 16 + RTFCharToHex(info->rtfMajor); + } + else + val = info->rtfMajor; } - if (RTFCheckCM(info, rtfGroup, rtfEndGroup)) - break; - if (info->rtfClass != rtfText) goto skip_group; - if (flip) + if (flip) FIXME("wrong hex string\n"); + + *out = buf; + return read; +} + +static void ME_RTFReadPictGroup(RTF_Info *info) +{ + SIZEL sz; + BYTE *buffer = NULL; + DWORD size = 0; + METAFILEPICT mfp; + HENHMETAFILE hemf; + HBITMAP hbmp; + enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_metafile, gfx_dib} gfx = gfx_unknown; + int level = 1; + + mfp.mm = MM_TEXT; + sz.cx = sz.cy = 0; + + for (;;) { - if (bufidx >= bufsz && - !(buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, bufsz += 1024))) - goto skip_group; - buffer[bufidx++] = RTFCharToHex(val) * 16 + RTFCharToHex(info->rtfMajor); + RTFGetToken( info ); + + if (info->rtfClass == rtfText) + { + if (level == 1) + { + if (!buffer) + size = read_hex_data( info, &buffer ); + } + else + { + RTFSkipGroup( info ); + } + } /* We potentially have a new token so fall through. */ + + if (info->rtfClass == rtfEOF) return; + + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + { + if (--level == 0) break; + continue; + } + if (RTFCheckCM( info, rtfGroup, rtfBeginGroup )) + { + level++; + continue; + } + if (!RTFCheckCM( info, rtfControl, rtfPictAttr )) + { + RTFRouteToken( info ); + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + level--; + continue; + } + + if (RTFCheckMM( info, rtfPictAttr, rtfWinMetafile )) + { + mfp.mm = info->rtfParam; + gfx = gfx_metafile; + } + else if (RTFCheckMM( info, rtfPictAttr, rtfDevIndBitmap )) + { + if (info->rtfParam != 0) FIXME("dibitmap should be 0 (%d)\n", info->rtfParam); + gfx = gfx_dib; + } + else if (RTFCheckMM( info, rtfPictAttr, rtfEmfBlip )) + gfx = gfx_enhmetafile; + else if (RTFCheckMM( info, rtfPictAttr, rtfPicWid )) + mfp.xExt = info->rtfParam; + else if (RTFCheckMM( info, rtfPictAttr, rtfPicHt )) + mfp.yExt = info->rtfParam; + else if (RTFCheckMM( info, rtfPictAttr, rtfPicGoalWid )) + sz.cx = info->rtfParam; + else if (RTFCheckMM( info, rtfPictAttr, rtfPicGoalHt )) + sz.cy = info->rtfParam; + else + FIXME("Non supported attribute: %d %d %d\n", info->rtfClass, info->rtfMajor, info->rtfMinor); } - else - val = info->rtfMajor; - } - if (flip) FIXME("wrong hex string\n"); - switch (gfx) - { - case gfx_enhmetafile: - if ((hemf = SetEnhMetaFileBits(bufidx, buffer))) - ME_RTFInsertOleObject(info, hemf, NULL, &sz); - break; - case gfx_metafile: - if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) - ME_RTFInsertOleObject(info, hemf, NULL, &sz); - break; - case gfx_dib: + if (buffer) { - BITMAPINFO* bi = (BITMAPINFO*)buffer; - HDC hdc = GetDC(0); - unsigned nc = bi->bmiHeader.biClrUsed; - - /* not quite right, especially for bitfields type of compression */ - if (!nc && bi->bmiHeader.biBitCount <= 8) - nc = 1 << bi->bmiHeader.biBitCount; - if ((hbmp = CreateDIBitmap(hdc, &bi->bmiHeader, - CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), - bi, DIB_RGB_COLORS))) - ME_RTFInsertOleObject(info, NULL, hbmp, &sz); - ReleaseDC(0, hdc); + switch (gfx) + { + case gfx_enhmetafile: + if ((hemf = SetEnhMetaFileBits( size, buffer ))) + ME_RTFInsertOleObject( info, hemf, NULL, &sz ); + break; + case gfx_metafile: + if ((hemf = SetWinMetaFileBits( size, buffer, NULL, &mfp ))) + ME_RTFInsertOleObject( info, hemf, NULL, &sz ); + break; + case gfx_dib: + { + BITMAPINFO *bi = (BITMAPINFO*)buffer; + HDC hdc = GetDC(0); + unsigned nc = bi->bmiHeader.biClrUsed; + + /* not quite right, especially for bitfields type of compression */ + if (!nc && bi->bmiHeader.biBitCount <= 8) + nc = 1 << bi->bmiHeader.biBitCount; + if ((hbmp = CreateDIBitmap( hdc, &bi->bmiHeader, + CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), + bi, DIB_RGB_COLORS)) ) + ME_RTFInsertOleObject( info, NULL, hbmp, &sz ); + ReleaseDC( 0, hdc ); + break; + } + default: + break; + } } - break; - default: - break; - } - HeapFree(GetProcessHeap(), 0, buffer); - RTFRouteToken (info); /* feed "}" back to router */ - return; -skip_group: - HeapFree(GetProcessHeap(), 0, buffer); - RTFSkipGroup(info); - RTFRouteToken(info); /* feed "}" back to router */ + HeapFree( GetProcessHeap(), 0, buffer ); + RTFRouteToken( info ); /* feed "}" back to router */ + return; } /* for now, lookup the \result part and use it, whatever the object */

1 0

Huw Davies : riched20: Add support for the \shppict destination.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 2d23a95c96e709b19bd51faa2a8516694278e544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d23a95c96e709b19bd51faa2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:49:56 2015 +0000 riched20: Add support for the \shppict destination. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 30 ++++++++++++++++++++++++++++++ dlls/riched20/reader.c | 2 ++ dlls/riched20/rtf.h | 4 +++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 31d134f..98c7414 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1236,6 +1236,35 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm return ret; } +static void ME_RTFReadShpPictGroup( RTF_Info *info ) +{ + int level = 1; + + for (;;) + { + RTFGetToken (info); + + if (info->rtfClass == rtfEOF) return; + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + { + if (--level == 0) break; + } + else if (RTFCheckCM( info, rtfGroup, rtfBeginGroup )) + { + level++; + } + else + { + RTFRouteToken( info ); + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + level--; + } + } + + RTFRouteToken( info ); /* feed "}" back to router */ + return; +} + static DWORD read_hex_data( RTF_Info *info, BYTE **out ) { DWORD read = 0, size = 1024; @@ -1579,6 +1608,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre WriterInit(&parser); RTFInit(&parser); RTFSetReadHook(&parser, ME_RTFReadHook); + RTFSetDestinationCallback(&parser, rtfShpPict, ME_RTFReadShpPictGroup); RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup); RTFSetDestinationCallback(&parser, rtfObject, ME_RTFReadObjectGroup); if (!parser.editor->bEmulateVersion10) /* v4.1 */ diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index e5202aa..0972911 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1808,6 +1808,8 @@ static RTFKey rtfKey[] = { rtfDestination, rtfNeXTGraphic, "NeXTGraphic", 0 }, { rtfDestination, rtfNestTableProps, "nesttableprops", 0 }, { rtfDestination, rtfNoNestTables, "nonesttables", 0 }, + { rtfDestination, rtfShpPict, "shppict", 0 }, + { rtfDestination, rtfNonShpPict, "nonshppict", 0 }, /* * Font families diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 064ba60..335d098 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -184,7 +184,9 @@ # define rtfGenerator 74 # define rtfNestTableProps 75 # define rtfNoNestTables 76 -# define rtfMaxDestination 77 /* highest dest + 1 */ +# define rtfShpPict 77 +# define rtfNonShpPict 78 +# define rtfMaxDestination 79 /* highest dest + 1 */ # define rtfFontFamily 4 # define rtfFFNil 0

1 0

Riccardo Bortolato : wined3d: Introduce wined3d_rendertarget_view_create_from_sub_resource().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 3e491662ba90f97d834dd4cddec1c46b5af49d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e491662ba90f97d834dd4cdd… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 28 14:02:10 2015 +0100 wined3d: Introduce wined3d_rendertarget_view_create_from_sub_resource(). Initial usage in d3d9. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 4 ++-- dlls/wined3d/view.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 23bb43c..18fbf21 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -428,8 +428,8 @@ struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9 if (surface->wined3d_rtv) return surface->wined3d_rtv; - if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(surface->wined3d_surface, - surface, &d3d9_view_wined3d_parent_ops, &surface->wined3d_rtv))) + if (FAILED(hr = wined3d_rendertarget_view_create_from_sub_resource(surface->wined3d_texture, + surface->sub_resource_idx, surface, &d3d9_view_wined3d_parent_ops, &surface->wined3d_rtv))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); return NULL; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 846f7fd..e621356 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -160,6 +160,28 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surfa return wined3d_rendertarget_view_create(&desc, &surface->container->resource, parent, parent_ops, view); } +HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view) +{ + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u, parent %p, parent_ops %p, view %p.\n", + texture, sub_resource_idx, parent, parent_ops, view); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + return WINED3DERR_INVALIDCALL; + + if (sub_resource->type != WINED3D_RTYPE_SURFACE) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(texture->resource.type)); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_rendertarget_view_create_from_surface(surface_from_resource(sub_resource), + parent, parent_ops, view); +} + ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6720350..5b87b18 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -187,6 +187,7 @@ @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_create_from_surface(ptr ptr ptr ptr) +@ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) @ cdecl wined3d_rendertarget_view_get_parent(ptr) @ cdecl wined3d_rendertarget_view_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 82ad493..0f27924 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2430,6 +2430,9 @@ HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarg struct wined3d_rendertarget_view **view); HRESULT __cdecl wined3d_rendertarget_view_create_from_surface(struct wined3d_surface *surface, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view); +HRESULT __cdecl wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view); ULONG __cdecl wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view); void * __cdecl wined3d_rendertarget_view_get_parent(const struct wined3d_rendertarget_view *view); struct wined3d_resource * __cdecl wined3d_rendertarget_view_get_resource(const struct wined3d_rendertarget_view *view);

1 0

Riccardo Bortolato : d3d8: Use wined3d_rendertarget_view_create_from_sub_resource() in d3d8_surface_get_rendertarget_view().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: c43b290fa52e9f59cd0db95e237d1b28e9883c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43b290fa52e9f59cd0db95e2… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 28 14:02:11 2015 +0100 d3d8: Use wined3d_rendertarget_view_create_from_sub_resource() in d3d8_surface_get_rendertarget_view(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 8153340..317b2a6 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -347,24 +347,13 @@ static const struct wined3d_parent_ops d3d8_view_wined3d_parent_ops = struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) { - struct wined3d_resource *resource; - struct wined3d_resource_desc resource_desc; - struct wined3d_rendertarget_view_desc desc; HRESULT hr; if (surface->wined3d_rtv) return surface->wined3d_rtv; - resource = wined3d_texture_get_resource(surface->wined3d_texture); - wined3d_resource_get_desc(resource, &resource_desc); - - desc.format_id = resource_desc.format; - desc.u.texture.level_idx = surface->sub_resource_idx; - desc.u.texture.layer_idx = 0; - desc.u.texture.layer_count = 1; - - if (FAILED(hr = wined3d_rendertarget_view_create(&desc, resource, - surface, &d3d8_view_wined3d_parent_ops, &surface->wined3d_rtv))) + if (FAILED(hr = wined3d_rendertarget_view_create_from_sub_resource(surface->wined3d_texture, + surface->sub_resource_idx, surface, &d3d8_view_wined3d_parent_ops, &surface->wined3d_rtv))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); return NULL;

1 0

Riccardo Bortolato : wined3d: Introduce wined3d_texture_get_dc().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: a2f2d238d437d34679b9001a49dc2170fc8cee16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f2d238d437d34679b9001a4… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 28 14:02:12 2015 +0100 wined3d: Introduce wined3d_texture_get_dc(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 2 +- dlls/wined3d/texture.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 18fbf21..1a2cd54 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -297,7 +297,7 @@ static HRESULT WINAPI d3d9_surface_GetDC(IDirect3DSurface9 *iface, HDC *dc) } wined3d_mutex_lock(); - hr = wined3d_surface_getdc(surface->wined3d_surface, dc); + hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a6d26ef..ef19ac1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1540,3 +1540,21 @@ HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned in return texture->texture_ops->texture_sub_resource_unmap(sub_resource); } + +HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc) +{ + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u, dc %p.\n", texture, sub_resource_idx, dc); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + return WINED3DERR_INVALIDCALL; + + if (sub_resource->type != WINED3D_RTYPE_SURFACE) + { + WARN("Not supported on %s resources.\n", debug_d3dresourcetype(texture->resource.type)); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_surface_getdc(surface_from_resource(sub_resource), dc); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5b87b18..8466844 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_texture_decref(ptr) @ cdecl wined3d_texture_generate_mipmaps(ptr) @ cdecl wined3d_texture_get_autogen_filter_type(ptr) +@ cdecl wined3d_texture_get_dc(ptr long ptr) @ cdecl wined3d_texture_get_level_count(ptr) @ cdecl wined3d_texture_get_lod(ptr) @ cdecl wined3d_texture_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0f27924..8c174e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2537,6 +2537,7 @@ HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const stru ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture); void __cdecl wined3d_texture_generate_mipmaps(struct wined3d_texture *texture); enum wined3d_texture_filter_type __cdecl wined3d_texture_get_autogen_filter_type(const struct wined3d_texture *texture); +HRESULT __cdecl wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc); DWORD __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture);

1 0

Riccardo Bortolato : wined3d: Introduce wined3d_texture_release_dc().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 96dd79375601923ab159ce451a049db0fb813b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=96dd79375601923ab159ce451… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 28 14:02:13 2015 +0100 wined3d: Introduce wined3d_texture_release_dc(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 2 +- dlls/wined3d/texture.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 1a2cd54..58d2309 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -311,7 +311,7 @@ static HRESULT WINAPI d3d9_surface_ReleaseDC(IDirect3DSurface9 *iface, HDC dc) TRACE("iface %p, dc %p.\n", iface, dc); wined3d_mutex_lock(); - hr = wined3d_surface_releasedc(surface->wined3d_surface, dc); + hr = wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); wined3d_mutex_unlock(); switch (hr) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ef19ac1..057211e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1558,3 +1558,21 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i return wined3d_surface_getdc(surface_from_resource(sub_resource), dc); } + +HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc) +{ + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u, dc %p.\n", texture, sub_resource_idx, dc); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + return WINED3DERR_INVALIDCALL; + + if (sub_resource->type != WINED3D_RTYPE_SURFACE) + { + WARN("Not supported on %s resources.\n", debug_d3dresourcetype(texture->resource.type)); + return WINED3DERR_INVALIDCALL; + } + + return wined3d_surface_releasedc(surface_from_resource(sub_resource), dc); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8466844..219c190 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -270,6 +270,7 @@ @ cdecl wined3d_texture_get_sub_resource(ptr long) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) +@ cdecl wined3d_texture_release_dc(ptr long ptr) @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8c174e0..9cc1e1c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2553,6 +2553,7 @@ HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); HRESULT __cdecl wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); +HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); HRESULT __cdecl wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id,

1 0

Henri Verbeet : wined3d: Add a missing TRACE to wined3d_texture_map().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 8cc557a7052006577a1cae4c6bea901bc3cfde04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc557a7052006577a1cae4c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 28 14:02:14 2015 +0100 wined3d: Add a missing TRACE to wined3d_texture_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 057211e..4a518ef 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1523,9 +1523,12 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct HRESULT CDECL wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { - struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); + struct wined3d_resource *sub_resource; - if (!sub_resource) + TRACE("texture %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n", + texture, sub_resource_idx, map_desc, box, flags); + + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) return WINED3DERR_INVALIDCALL; return texture->texture_ops->texture_sub_resource_map(sub_resource, map_desc, box, flags);

1 0

Henri Verbeet : wined3d: Add a missing TRACE to wined3d_texture_unmap().
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: b0f267ae9dd38acb5f9879389bfe7792ddc9e32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f267ae9dd38acb5f9879389… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 28 14:02:15 2015 +0100 wined3d: Add a missing TRACE to wined3d_texture_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4a518ef..f8ebfff 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1536,9 +1536,11 @@ HRESULT CDECL wined3d_texture_map(struct wined3d_texture *texture, unsigned int HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); + struct wined3d_resource *sub_resource; + + TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); - if (!sub_resource) + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) return WINED3DERR_INVALIDCALL; return texture->texture_ops->texture_sub_resource_unmap(sub_resource);

1 0

Nikolay Sivov : d3dx9_36/tests: Use proper printf format (PVS-Studio).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 67738a41c414a0e9ba15d108f49ed7904f612d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67738a41c414a0e9ba15d108f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 00:27:53 2015 +0300 d3dx9_36/tests: Use proper printf format (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 6 +++--- dlls/d3dx9_36/tests/xfile.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4186e19..3b1fafa 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1487,8 +1487,8 @@ static void check_vertex_buffer_(int line, ID3DXMesh *mesh, const void *vertices return; if (mesh_fvf == fvf) { - DWORD vertex_size = D3DXGetFVFVertexSize(fvf); - int i; + DWORD vertex_size = D3DXGetFVFVertexSize(fvf), i; + for (i = 0; i < min(num_vertices, mesh_num_vertices); i++) { const FLOAT *exp_float = vertices; @@ -2568,7 +2568,7 @@ static void test_polygon(IDirect3DDevice9 *device, float length, unsigned int si mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; - sprintf(name, "polygon (%g, %d)", length, sides); + sprintf(name, "polygon (%g, %u)", length, sides); compare_mesh(name, polygon, &mesh); free_mesh(&mesh); diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 1a56f20..9c722b7 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -343,7 +343,7 @@ static void test_dump(void) goto exit; } - printf("Load templates file (%d bytes)\n", size); + printf("Load templates file (%u bytes)\n", size); ret = D3DXFileCreate(&xfile); ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret);

1 0