August 2014 - Wine-commits - list.winehq.org

Frédéric Delanoy : French translation for release 1.7.25
by Jeremy Newman 25 Aug '14

25 Aug '14

Module: website Branch: master Commit: f8d1eab6da00a06b249fbc6b906177f411ab16ae URL: http://source.winehq.org/git/website.git/?a=commit;h=f8d1eab6da00a06b249fbc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 23 10:42:40 2014 +0200 French translation for release 1.7.25 --- news/fr/2014082201.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014082201.xml b/news/fr/2014082201.xml new file mode 100644 index 0000000..81becae --- /dev/null +++ b/news/fr/2014082201.xml @@ -0,0 +1,15 @@ +<news> +<date>22 août 2014</date> +<title>Sortie de Wine 1.7.25</title> +<body> + La version de développement 1.7.25 de Wine est disponible. + <a href="{$root}/announce/1.7.25">Nouveautés</a> de cette version : +<ul> + <li>Implémentation de la bibliothèque de capture de paquets.</li> + <li>Quelques fonctions DirectWrite supplémentaires.</li> + <li>Prise en charge améliorée des tables HTML.</li> + <li>Fonctions mathématiques VBScript additionnelles.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.25.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.25
by Jeremy Newman 25 Aug '14

25 Aug '14

Module: website Branch: master Commit: b90e66d4542b01c3578276997c258fe6771a3015 URL: http://source.winehq.org/git/website.git/?a=commit;h=b90e66d4542b01c3578276… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 25 09:33:57 2014 +0200 German translation for release 1.7.25 --- news/de/2014082201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014082201.xml b/news/de/2014082201.xml new file mode 100644 index 0000000..29aac4b --- /dev/null +++ b/news/de/2014082201.xml @@ -0,0 +1,16 @@ +<news> +<date>22. August 2014</date> +<title>Wine 1.7.25 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.25 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.25">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Implementierung der Paketsammler-Bibliothek (wpcap).</li> + <li>Einige zusätzliche DirectWrite-Funktionen.</li> + <li>Verbesserungen der HTML-Tabellen Unterstützung.</li> + <li>Mehr mathematische VBScript-Funktionen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.25.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.25
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: website Branch: master Commit: d4d798ae895fa79f2fb0d3d7db22f8c4420dba3f URL: http://source.winehq.org/git/website.git/?a=commit;h=d4d798ae895fa79f2fb0d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 20:48:52 2014 +0200 Wine release 1.7.25 --- news/en/2014082201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014082201.xml b/news/en/2014082201.xml new file mode 100644 index 0000000..815dfee --- /dev/null +++ b/news/en/2014082201.xml @@ -0,0 +1,16 @@ +<news> +<date>August 22, 2014</date> +<title>Wine 1.7.25 Released</title> +<body> + The Wine development release 1.7.25 is now available. + <a href="{$root}/announce/1.7.25">What's new</a> in this release: +<ul> + <li>Implementation of the packet capture library.</li> + <li>A few more DirectWrite functions.</li> + <li>Improvements in HTML table support.</li> + <li>More VBScript math functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.25.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : kernel32: Add detection of fake dlls when determining a binary type.
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: ea1689e7b06a5f03a882bde9ee566939e9171330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea1689e7b06a5f03a882bde9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 12:44:24 2014 +0200 kernel32: Add detection of fake dlls when determining a binary type. --- dlls/kernel32/kernel_private.h | 5 +++-- dlls/kernel32/module.c | 12 ++++++++++++ dlls/kernel32/process.c | 5 +++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 5c6c197..76611d7 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -75,8 +75,9 @@ enum binary_type BINARY_UNIX_LIB }; -#define BINARY_FLAG_DLL 0x01 -#define BINARY_FLAG_64BIT 0x02 +#define BINARY_FLAG_DLL 0x01 +#define BINARY_FLAG_64BIT 0x02 +#define BINARY_FLAG_FAKEDLL 0x04 struct binary_info { diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 514b6be..ca4cf41 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -339,6 +339,9 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) { if (len >= sizeof(ext_header.nt.FileHeader)) { + static const char fakedll_signature[] = "Wine placeholder DLL"; + char buffer[sizeof(fakedll_signature)]; + info->type = BINARY_PE; info->arch = ext_header.nt.FileHeader.Machine; if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) @@ -356,6 +359,15 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) info->flags |= BINARY_FLAG_64BIT; break; } + + if (header.mz.e_lfanew >= sizeof(header.mz) + sizeof(fakedll_signature) && + SetFilePointer( hfile, sizeof(header.mz), NULL, SEEK_SET ) == sizeof(header.mz) && + ReadFile( hfile, buffer, sizeof(fakedll_signature), &len, NULL ) && + len == sizeof(fakedll_signature) && + !memcmp( buffer, fakedll_signature, sizeof(fakedll_signature) )) + { + info->flags |= BINARY_FLAG_FAKEDLL; + } } } else if (!memcmp( &ext_header.os2.ne_magic, "NE", 2 )) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2566ac4..301c64a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2342,9 +2342,10 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A else switch (binary_info.type) { case BINARY_PE: - TRACE( "starting %s as Win%d binary (%p-%p, arch %04x)\n", + TRACE( "starting %s as Win%d binary (%p-%p, arch %04x%s)\n", debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, - binary_info.res_start, binary_info.res_end, binary_info.arch ); + binary_info.res_start, binary_info.res_end, binary_info.arch, + (binary_info.flags & BINARY_FLAG_FAKEDLL) ? ", fakedll" : "" ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break;

1 0

Henri Verbeet : wined3d: Also update the container in wined3d_surface_update_desc().
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: 9f9731410bf79d3bee8b2ce16bee2a7f9962e0f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9731410bf79d3bee8b2ce16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 22 12:32:00 2014 +0200 wined3d: Also update the container in wined3d_surface_update_desc(). This fixes a bug exposed by commit 415b8037206b1d4c104d9623037458739f6cfdf5. In particular, wined3d_resource_update_draw_binding() uses the multisample type to determine to appropriate draw binding, and since we never updated that for the container, we could end up with an incorrect draw binding after a device reset. --- dlls/wined3d/surface.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b466524..1f96872 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2372,6 +2372,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + struct wined3d_texture *texture; BOOL create_dib = FALSE; HRESULT hr; DWORD valid_location = 0; @@ -2448,6 +2449,13 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, if (surface->resource.map_binding == WINED3D_LOCATION_BUFFER && !surface_use_pbo(surface)) surface->resource.map_binding = create_dib ? WINED3D_LOCATION_DIB : WINED3D_LOCATION_SYSMEM; + texture = surface->container; + texture->resource.format = format; + texture->resource.multisample_type = multisample_type; + texture->resource.multisample_quality = multisample_quality; + texture->resource.width = width; + texture->resource.height = height; + if (create_dib) { if (FAILED(hr = surface_create_dib_section(surface)))

1 0

Henri Verbeet : wined3d: Use rendertarget views for depth/ stencil buffers instead of surfaces.
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: 07985a8c3836946c20488203a6f35cef0bf1928b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07985a8c3836946c20488203a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 22 12:32:01 2014 +0200 wined3d: Use rendertarget views for depth/stencil buffers instead of surfaces. I don't think the difference between d3d10 depth/stencil and rendertarget views is large enough to justify a separate type. Unfortunately that does make the name "wined3d_rendertarget_view" slightly awkward. --- dlls/d3d8/device.c | 17 +++-- dlls/d3d9/device.c | 11 +-- dlls/ddraw/ddraw.c | 13 ++-- dlls/ddraw/device.c | 6 +- dlls/wined3d/context.c | 14 ++-- dlls/wined3d/cs.c | 39 +++++------ dlls/wined3d/device.c | 151 +++++++++++++++++++++-------------------- dlls/wined3d/drawprim.c | 6 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 19 ++++-- dlls/wined3d/swapchain.c | 30 +++++--- dlls/wined3d/wined3d.spec | 4 +- dlls/wined3d/wined3d_private.h | 7 +- include/wine/wined3d.h | 5 +- 14 files changed, 181 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07985a8c3836946c20488…

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_color_fill().
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: 736b9e1c1c4ae3caf7b0dc78b5ffaef8b00cc954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736b9e1c1c4ae3caf7b0dc78b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 22 12:32:02 2014 +0200 wined3d: Get rid of wined3d_device_color_fill(). --- dlls/d3d10core/device.c | 8 ++++--- dlls/d3d9/device.c | 10 +++++++-- dlls/wined3d/device.c | 54 ++++++++++++++++------------------------------- dlls/wined3d/wined3d.spec | 3 +-- include/wine/wined3d.h | 6 ++---- 5 files changed, 34 insertions(+), 47 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ac43ca6..9668964 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -535,14 +535,16 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *ifac static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 *iface, ID3D10RenderTargetView *render_target_view, const FLOAT color_rgba[4]) { - struct d3d10_device *This = impl_from_ID3D10Device(iface); + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_rendertarget_view *view = unsafe_impl_from_ID3D10RenderTargetView(render_target_view); const struct wined3d_color color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; + HRESULT hr; - TRACE("iface %p, render_target_view %p, color_rgba [%f %f %f %f]\n", + TRACE("iface %p, render_target_view %p, color_rgba {%.8e, %.8e, %.8e, %.8e}.\n", iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); - wined3d_device_clear_rendertarget_view(This->wined3d_device, view->wined3d_view, &color); + if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, &color))) + ERR("Failed to clear view, hr %#x.\n", hr); } static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 *iface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2d05e11..7b9b635 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1271,8 +1271,14 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } - /* Colorfill can only be used on rendertarget surfaces, or offscreen plain surfaces in D3DPOOL_DEFAULT */ - hr = wined3d_device_color_fill(device->wined3d_device, surface_impl->wined3d_surface, rect, &c); + if (desc.pool != WINED3D_POOL_DEFAULT && desc.pool != WINED3D_POOL_SYSTEM_MEM) + { + WARN("Color-fill not allowed on surfaces in pool %#x.\n", desc.pool); + return D3DERR_INVALIDCALL; + } + + hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, + d3d9_surface_get_rendertarget_view(surface_impl), rect, &c); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 796d995..9df422f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -609,9 +609,11 @@ static void device_load_logo(struct wined3d_device *device, const char *filename } else { + const RECT rect = {0, 0, surface->resource.width, surface->resource.height}; const struct wined3d_color c = {1.0f, 1.0f, 1.0f, 1.0f}; + /* Fill the surface with a white color to show that wined3d is there */ - wined3d_device_color_fill(device, surface, NULL, &c); + surface_color_fill(surface, &rect, &c); } out: @@ -3658,30 +3660,6 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, return surface_upload_from_surface(dst_surface, dst_point, src_surface, src_rect); } -HRESULT CDECL wined3d_device_color_fill(struct wined3d_device *device, - struct wined3d_surface *surface, const RECT *rect, const struct wined3d_color *color) -{ - RECT r; - - TRACE("device %p, surface %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", - device, surface, wine_dbgstr_rect(rect), - color->r, color->g, color->b, color->a); - - if (surface->resource.pool != WINED3D_POOL_DEFAULT && surface->resource.pool != WINED3D_POOL_SYSTEM_MEM) - { - WARN("Color-fill not allowed on %s surfaces.\n", debug_d3dpool(surface->resource.pool)); - return WINED3DERR_INVALIDCALL; - } - - if (!rect) - { - SetRect(&r, 0, 0, surface->resource.width, surface->resource.height); - rect = &r; - } - - return surface_color_fill(surface, rect, color); -} - void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { @@ -3753,33 +3731,37 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, } } -void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const struct wined3d_color *color) +HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, + struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color) { struct wined3d_resource *resource; - HRESULT hr; - RECT rect; + RECT r; - TRACE("device %p, view %p, color {%.8e, %.8e, %.8e, %.8e}.\n", - device, view, color->r, color->g, color->b, color->a); + TRACE("device %p, view %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", + device, view, wine_dbgstr_rect(rect), color->r, color->g, color->b, color->a); resource = view->resource; if (resource->type != WINED3D_RTYPE_TEXTURE && resource->type != WINED3D_RTYPE_CUBE_TEXTURE) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); - return; + return WINED3DERR_INVALIDCALL; } if (view->depth > 1) { FIXME("Layered clears not implemented.\n"); - return; + return WINED3DERR_INVALIDCALL; + } + + if (!rect) + { + SetRect(&r, 0, 0, view->width, view->height); + rect = &r; } - SetRect(&rect, 0, 0, view->width, view->height); resource = wined3d_texture_get_sub_resource(wined3d_texture_from_resource(resource), view->sub_resource_idx); - if (FAILED(hr = surface_color_fill(surface_from_resource(resource), &rect, color))) - ERR("Color fill failed, hr %#x.\n", hr); + + return surface_color_fill(surface_from_resource(resource), rect, color); } struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2b4236b..0ee16c4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -36,8 +36,7 @@ @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_begin_stateblock(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) -@ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr) -@ cdecl wined3d_device_color_fill(ptr ptr ptr ptr) +@ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ca4a6af..6dda931 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2095,10 +2095,8 @@ HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -void __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color); -HRESULT __cdecl wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface, - const RECT *rect, const struct wined3d_color *color); +HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, + struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color); void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMSetRenderTargets().
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: 28d7affa902f347cfb08d1a4b5c8338bf93d323e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d7affa902f347cfb08d1a4b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 22 12:32:03 2014 +0200 d3d10core: Implement d3d10_device_OMSetRenderTargets(). --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/device.c | 22 ++++++++++- dlls/d3d10core/view.c | 78 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 8497f3a..bf6a592 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -125,6 +125,7 @@ struct d3d10_depthstencil_view ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; + struct wined3d_rendertarget_view *wined3d_view; D3D10_DEPTH_STENCIL_VIEW_DESC desc; ID3D10Resource *resource; ID3D10Device1 *device; @@ -132,6 +133,7 @@ struct d3d10_depthstencil_view HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; +struct d3d10_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 9668964..92b4622 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -395,8 +395,28 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device1 *ifa UINT render_target_view_count, ID3D10RenderTargetView *const *render_target_views, ID3D10DepthStencilView *depth_stencil_view) { - FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct d3d10_depthstencil_view *dsv; + unsigned int i; + + TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p.\n", iface, render_target_view_count, render_target_views, depth_stencil_view); + + for (i = 0; i < render_target_view_count; ++i) + { + struct d3d10_rendertarget_view *rtv = unsafe_impl_from_ID3D10RenderTargetView(render_target_views[i]); + + wined3d_device_set_rendertarget_view(device->wined3d_device, i, + rtv ? rtv->wined3d_view : NULL, FALSE); + } + for (; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + wined3d_device_set_rendertarget_view(device->wined3d_device, i, NULL, FALSE); + } + + dsv = unsafe_impl_from_ID3D10DepthStencilView(depth_stencil_view); + wined3d_device_set_depth_stencil_view(device->wined3d_device, + dsv ? dsv->wined3d_view : NULL); } static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index fb69f51..27b09a8 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -404,6 +404,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStenci if (!refcount) { + wined3d_rendertarget_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); ID3D10Device1_Release(This->device); HeapFree(GetProcessHeap(), 0, This); @@ -492,9 +493,63 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = d3d10_depthstencil_view_GetDesc, }; +static void wined3d_depth_stencil_view_desc_from_d3d10core(struct wined3d_rendertarget_view_desc *wined3d_desc, + const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) +{ + wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format); + + switch (desc->ViewDimension) + { + case D3D10_DSV_DIMENSION_TEXTURE1D: + wined3d_desc->u.texture.level_idx = desc->u.Texture1D.MipSlice; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_DSV_DIMENSION_TEXTURE1DARRAY: + wined3d_desc->u.texture.level_idx = desc->u.Texture1DArray.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture1DArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture1DArray.ArraySize; + break; + + case D3D10_DSV_DIMENSION_TEXTURE2D: + wined3d_desc->u.texture.level_idx = desc->u.Texture2D.MipSlice; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_DSV_DIMENSION_TEXTURE2DARRAY: + wined3d_desc->u.texture.level_idx = desc->u.Texture2DArray.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture2DArray.ArraySize; + break; + + case D3D10_DSV_DIMENSION_TEXTURE2DMS: + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_DSV_DIMENSION_TEXTURE2DMSARRAY: + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; + + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + } +} + HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc) { + struct wined3d_rendertarget_view_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; HRESULT hr; view->ID3D10DepthStencilView_iface.lpVtbl = &d3d10_depthstencil_view_vtbl; @@ -510,6 +565,20 @@ HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struc view->desc = *desc; } + if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + { + ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); + return E_FAIL; + } + + wined3d_depth_stencil_view_desc_from_d3d10core(&wined3d_desc, &view->desc); + if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, + view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view))) + { + WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr); + return hr; + } + view->resource = resource; ID3D10Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface; @@ -518,6 +587,15 @@ HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view, struc return S_OK; } +struct d3d10_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_depthstencil_view_vtbl); + + return impl_from_ID3D10DepthStencilView(iface); +} + static inline struct d3d10_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) { return CONTAINING_RECORD(iface, struct d3d10_rendertarget_view, ID3D10RenderTargetView_iface);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMGetRenderTargets().
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: 2fa847280ace26b8d1acc9ec67e14da00b25f472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa847280ace26b8d1acc9ec6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 22 12:32:04 2014 +0200 d3d10core: Implement d3d10_device_OMGetRenderTargets(). --- dlls/d3d10core/device.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 92b4622..bb5265b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -916,8 +916,46 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *iface, UINT view_count, ID3D10RenderTargetView **render_target_views, ID3D10DepthStencilView **depth_stencil_view) { - FIXME("iface %p, view_count %u, render_target_views %p, depth_stencil_view %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_rendertarget_view *wined3d_view; + + TRACE("iface %p, view_count %u, render_target_views %p, depth_stencil_view %p.\n", iface, view_count, render_target_views, depth_stencil_view); + + if (render_target_views) + { + struct d3d10_rendertarget_view *view_impl; + unsigned int i; + + for (i = 0; i < view_count; ++i) + { + if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i))) + { + render_target_views[i] = NULL; + continue; + } + + view_impl = wined3d_rendertarget_view_get_parent(wined3d_view); + render_target_views[i] = &view_impl->ID3D10RenderTargetView_iface; + ID3D10RenderTargetView_AddRef(render_target_views[i]); + } + } + + if (depth_stencil_view) + { + struct d3d10_depthstencil_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + { + *depth_stencil_view = NULL; + } + else + { + view_impl = wined3d_rendertarget_view_get_parent(wined3d_view); + *depth_stencil_view = &view_impl->ID3D10DepthStencilView_iface; + ID3D10DepthStencilView_AddRef(*depth_stencil_view); + } + } } static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface,

1 0

Jacek Caban : mshtml: Added IHTMLDocument5:: get_implementation implementation.
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: fbe02eb74c03acb815effd29b423a268616f1413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe02eb74c03acb815effd29b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 22 14:48:37 2014 +0200 mshtml: Added IHTMLDocument5::get_implementation implementation. --- dlls/mshtml/htmldoc.c | 17 +++++- dlls/mshtml/main.c | 1 + dlls/mshtml/mshtml_private.h | 4 ++ dlls/mshtml/omnavigator.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 28 +++++++++ 5 files changed, 190 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6992c93..4837a89 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2617,8 +2617,21 @@ static HRESULT WINAPI HTMLDocument5_get_doctype(IHTMLDocument5 *iface, IHTMLDOMN static HRESULT WINAPI HTMLDocument5_get_implementation(IHTMLDocument5 *iface, IHTMLDOMImplementation **p) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLDocumentNode *doc_node = This->doc_node; + + TRACE("(%p)->(%p)\n", This, p); + + if(!doc_node->dom_implementation) { + HRESULT hres; + + hres = create_dom_implementation(&doc_node->dom_implementation); + if(FAILED(hres)) + return hres; + } + + IHTMLDOMImplementation_AddRef(doc_node->dom_implementation); + *p = doc_node->dom_implementation; + return S_OK; } static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR bstrattrName, diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1e7d992..8e11ce9 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -533,6 +533,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLDocument7); X(IID_IHTMLDOMAttribute); X(IID_IHTMLDOMChildrenCollection); + X(IID_IHTMLDOMImplementation); X(IID_IHTMLDOMNode); X(IID_IHTMLDOMNode2); X(IID_IHTMLElement); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5424a19..19e424f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -136,6 +136,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLDocument5) \ XIID(IHTMLDOMAttribute) \ XIID(IHTMLDOMChildrenCollection) \ + XIID(IHTMLDOMImplementation) \ XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMTextNode) \ @@ -732,6 +733,8 @@ struct HTMLDocumentNode { BOOL content_ready; event_target_t *body_event_target; + IHTMLDOMImplementation *dom_implementation; + ICatInformation *catmgr; nsDocumentEventListener *nsevent_listener; BOOL *event_vector; @@ -762,6 +765,7 @@ HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; +HRESULT create_dom_implementation(IHTMLDOMImplementation**) DECLSPEC_HIDDEN; HRESULT create_storage(IHTMLStorage**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 5b564a1..932d1c1 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -44,6 +44,148 @@ typedef struct { HTMLMimeTypesCollection *mime_types; } OmNavigator; +typedef struct { + DispatchEx dispex; + IHTMLDOMImplementation IHTMLDOMImplementation_iface; + + LONG ref; +} HTMLDOMImplementation; + +static inline HTMLDOMImplementation *impl_from_IHTMLDOMImplementation(IHTMLDOMImplementation *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMImplementation, IHTMLDOMImplementation_iface); +} + +static HRESULT WINAPI HTMLDOMImplementation_QueryInterface(IHTMLDOMImplementation *iface, REFIID riid, void **ppv) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IHTMLDOMImplementation, riid)) { + *ppv = &This->IHTMLDOMImplementation_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMImplementation_AddRef(IHTMLDOMImplementation *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMImplementation_Release(IHTMLDOMImplementation *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLDOMImplementation_GetTypeInfoCount(IHTMLDOMImplementation *iface, UINT *pctinfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMImplementation_GetTypeInfo(IHTMLDOMImplementation *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMImplementation_GetIDsOfNames(IHTMLDOMImplementation *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMImplementation_Invoke(IHTMLDOMImplementation *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMImplementation_hasFeature(IHTMLDOMImplementation *iface, BSTR feature, + VARIANT version, VARIANT_BOOL *pfHasFeature) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + FIXME("(%p)->(%s %s %p) returning false\n", This, debugstr_w(feature), debugstr_variant(&version), pfHasFeature); + + *pfHasFeature = VARIANT_FALSE; + return S_OK; +} + +static const IHTMLDOMImplementationVtbl HTMLDOMImplementationVtbl = { + HTMLDOMImplementation_QueryInterface, + HTMLDOMImplementation_AddRef, + HTMLDOMImplementation_Release, + HTMLDOMImplementation_GetTypeInfoCount, + HTMLDOMImplementation_GetTypeInfo, + HTMLDOMImplementation_GetIDsOfNames, + HTMLDOMImplementation_Invoke, + HTMLDOMImplementation_hasFeature +}; + +static const tid_t HTMLDOMImplementation_iface_tids[] = { + IHTMLDOMImplementation_tid, + 0 +}; +static dispex_static_data_t HTMLDOMImplementation_dispex = { + NULL, + IHTMLDOMImplementation_tid, + NULL, + HTMLDOMImplementation_iface_tids +}; + +HRESULT create_dom_implementation(IHTMLDOMImplementation **ret) +{ + HTMLDOMImplementation *dom_implementation; + + dom_implementation = heap_alloc_zero(sizeof(*dom_implementation)); + if(!dom_implementation) + return E_OUTOFMEMORY; + + dom_implementation->IHTMLDOMImplementation_iface.lpVtbl = &HTMLDOMImplementationVtbl; + dom_implementation->ref = 1; + + init_dispex(&dom_implementation->dispex, (IUnknown*)&dom_implementation->IHTMLDOMImplementation_iface, + &HTMLDOMImplementation_dispex); + + *ret = &dom_implementation->IHTMLDOMImplementation_iface; + return S_OK; +} + static inline OmHistory *impl_from_IOmHistory(IOmHistory *iface) { return CONTAINING_RECORD(iface, OmHistory, IOmHistory_iface); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 05f58a3..577d222 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5697,6 +5697,33 @@ static void test_window(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); } +static void test_dom_implementation(IHTMLDocument2 *doc) +{ + IHTMLDocument5 *doc5 = get_htmldoc5_iface((IUnknown*)doc); + IHTMLDOMImplementation *dom_implementation; + VARIANT_BOOL b; + VARIANT v; + BSTR str; + HRESULT hres; + + hres = IHTMLDocument5_get_implementation(doc5, &dom_implementation); + IHTMLDocument5_Release(doc5); + ok(hres == S_OK, "get_implementation failed: %08x\n", hres); + ok(dom_implementation != NULL, "dom_implementation == NULL\n"); + + str = a2bstr("test"); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("1.0"); + b = 100; + hres = IHTMLDOMImplementation_hasFeature(dom_implementation, str, v, &b); + SysFreeString(str); + VariantClear(&v); + ok(hres == S_OK, "hasFeature failed: %08x\n", hres); + ok(!b, "hasFeature returned %x\n", b); + + IHTMLDOMImplementation_Release(dom_implementation); +} + static void test_defaults(IHTMLDocument2 *doc) { IHTMLStyleSheetsCollection *stylesheetcol; @@ -5831,6 +5858,7 @@ static void test_defaults(IHTMLDocument2 *doc) test_default_selection(doc); test_doc_title(doc, ""); + test_dom_implementation(doc); } #define test_button_name(a,b) _test_button_name(__LINE__,a,b)

1 0