October 2015 - Wine-Commits

Dmitry Timoshkov : ntdll: Return from snoop tracing helpers earlier if tracing is disabled.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 6262cc325f1ee03e207ae494d3fd7867dcb7262d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6262cc325f1ee03e207ae494d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 19 10:28:31 2015 +0800 ntdll: Return from snoop tracing helpers earlier if tracing is disabled. This allows turning off and on snooping from task manager. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index ef0af0f..997de1f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -1085,6 +1085,8 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) context->Eip = (DWORD)fun->origfun; + if (!TRACE_ON(snoop)) return; + if (TRACE_ON(timestamp)) print_timestamp(); if (fun->name) DPRINTF("%04x:CALL %s.%s(",GetCurrentThreadId(),dll->name,fun->name); @@ -1121,6 +1123,12 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) if (ret->dll->funs[ret->ordinal].nrofargs<0) ret->dll->funs[ret->ordinal].nrofargs=(context->Esp - ret->origESP-4)/4; context->Eip = (DWORD)ret->origreturn; + + if (!TRACE_ON(snoop)) { + ret->origreturn = NULL; /* mark as empty */ + return; + } + if (TRACE_ON(timestamp)) print_timestamp(); if (ret->args) {

1 0

Nikolay Sivov : dwrite: Scale run origin by given ppdip run analysis was created with.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: d36a16ea10a724d860c85afd23301332aeb82491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36a16ea10a724d860c85afd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 08:43:03 2015 +0300 dwrite: Scale run origin by given ppdip run analysis was created with. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a2026ca..58eb90d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4399,8 +4399,8 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA analysis->ready = 0; analysis->bitmap = NULL; analysis->ppdip = ppdip; - analysis->originX = originX; - analysis->originY = originY; + analysis->originX = originX * ppdip; + analysis->originY = originY * ppdip; SetRectEmpty(&analysis->bounds); analysis->run = *run; IDWriteFontFace_AddRef(analysis->run.fontFace);

1 0

Nikolay Sivov : dwrite: Respect transform when calculating glyph advances for run analysis.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 08a3e4f29f450b0cf19e1ff70e5dd10d775b99b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a3e4f29f450b0cf19e1ff70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 08:43:05 2015 +0300 dwrite: Respect transform when calculating glyph advances for run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 4 ++-- dlls/dwrite/font.c | 5 +++-- dlls/dwrite/main.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 70aadcc..50c0462 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -130,8 +130,8 @@ extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *refer extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory2*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; -extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_MEASURING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,DWRITE_GRID_FIT_MODE, - DWRITE_TEXT_ANTIALIAS_MODE,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; +extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_MEASURING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,const DWRITE_MATRIX*, + DWRITE_GRID_FIT_MODE,DWRITE_TEXT_ANTIALIAS_MODE,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 58eb90d..b71d492 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4378,7 +4378,8 @@ static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { }; HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_GLYPH_RUN const *run, - FLOAT ppdip, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) + FLOAT ppdip, const DWRITE_MATRIX *transform, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, + FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; UINT32 i; @@ -4455,7 +4456,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: case DWRITE_MEASURING_MODE_GDI_NATURAL: - hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, run->fontEmSize, ppdip, NULL /* FIXME */, + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, run->fontEmSize, ppdip, transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, run->isSideways, 1, run->glyphIndices + i, &a); if (FAILED(hr)) analysis->advances[i] = 0.0; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index fc9d313..e5ce3aa 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1102,7 +1102,7 @@ static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *ifac return E_INVALIDARG; } - return create_glyphrunanalysis(rendering_mode, measuring_mode, run, ppdip, DWRITE_GRID_FIT_MODE_DEFAULT, + return create_glyphrunanalysis(rendering_mode, measuring_mode, run, ppdip, transform, DWRITE_GRID_FIT_MODE_DEFAULT, DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE, originX, originY, analysis); } @@ -1188,7 +1188,7 @@ static HRESULT WINAPI dwritefactory2_CreateGlyphRunAnalysis(IDWriteFactory2 *ifa TRACE("(%p)->(%p %p %d %d %d %d %.2f %.2f %p)\n", This, run, transform, rendering_mode, measuring_mode, gridfit_mode, aa_mode, originX, originY, analysis); - return create_glyphrunanalysis(rendering_mode, measuring_mode, run, 1.0f, gridfit_mode, aa_mode, originX, originY, analysis); + return create_glyphrunanalysis(rendering_mode, measuring_mode, run, 1.0f, transform, gridfit_mode, aa_mode, originX, originY, analysis); } static const struct IDWriteFactory2Vtbl dwritefactoryvtbl = {

1 0

Nikolay Sivov : strmbase: Switch to void for QualityControlImpl_Destroy().
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 4c80ec023d6affc00ff90a8b4a1a96d075dba9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c80ec023d6affc00ff90a8b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 11:57:52 2015 +0300 strmbase: Switch to void for QualityControlImpl_Destroy(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 4 ++-- dlls/strmbase/strmbase_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 9bdc251..2e32b57 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -49,9 +49,9 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl return S_OK; } -HRESULT QualityControlImpl_Destroy(QualityControlImpl *This) +void QualityControlImpl_Destroy(QualityControlImpl *This) { - return HeapFree(GetProcessHeap(),0,This); + HeapFree(GetProcessHeap(),0,This); } HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 6363bf5..4e5a25a 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -35,7 +35,7 @@ typedef struct QualityControlImpl { } QualityControlImpl; HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv); -HRESULT QualityControlImpl_Destroy(QualityControlImpl *This); +void QualityControlImpl_Destroy(QualityControlImpl *This); HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface);

1 0

Riccardo Bortolato : wined3d: Introduce a new wined3d_texture_blt function.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 6241ce5637d53d8355d5d3b06b014066be599c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6241ce5637d53d8355d5d3b06… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Fri Oct 16 13:59:19 2015 +0200 wined3d: Introduce a new wined3d_texture_blt function. 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/d3d8_private.h | 3 +-- dlls/d3d8/device.c | 14 +++++++------- dlls/d3d8/surface.c | 3 +-- dlls/wined3d/texture.c | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 9a5de92..958b3c0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -233,7 +233,6 @@ struct d3d8_surface struct d3d8_resource resource; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; - struct wined3d_surface *wined3d_surface; struct list rtv_entry; struct wined3d_rendertarget_view *wined3d_rtv; IDirect3DDevice8 *parent_device; @@ -243,7 +242,7 @@ struct d3d8_surface struct wined3d_rendertarget_view *d3d8_surface_get_rendertarget_view(struct d3d8_surface *surface) DECLSPEC_HIDDEN; void surface_init(struct d3d8_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_surface *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) DECLSPEC_HIDDEN; struct d3d8_vertexbuffer diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ae6bebb..6c94243 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1085,8 +1085,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, if (!rect_count && !src_rects && !dst_points) { RECT rect = {0, 0, src_w, src_h}; - wined3d_surface_blt(dst->wined3d_surface, &rect, - src->wined3d_surface, &rect, 0, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &rect, + src->wined3d_texture, src->sub_resource_idx, &rect, 0, NULL, WINED3D_TEXF_POINT); } else { @@ -1101,8 +1101,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, RECT dst_rect = {dst_points[i].x, dst_points[i].y, dst_points[i].x + w, dst_points[i].y + h}; - wined3d_surface_blt(dst->wined3d_surface, &dst_rect, - src->wined3d_surface, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &dst_rect, + src->wined3d_texture, src->sub_resource_idx, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); } } else @@ -1113,8 +1113,8 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, UINT h = src_rects[i].bottom - src_rects[i].top; RECT dst_rect = {0, 0, w, h}; - wined3d_surface_blt(dst->wined3d_surface, &dst_rect, - src->wined3d_surface, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, &dst_rect, + src->wined3d_texture, src->sub_resource_idx, &src_rects[i], 0, NULL, WINED3D_TEXF_POINT); } } } @@ -3003,7 +3003,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) return E_OUTOFMEMORY; - surface_init(d3d_surface, wined3d_texture, sub_resource_idx, surface, parent_ops); + surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); *parent = d3d_surface; TRACE("Created surface %p.\n", d3d_surface); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 077502d..8153340 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -301,14 +301,13 @@ static const struct wined3d_parent_ops d3d8_surface_wined3d_parent_ops = }; void surface_init(struct d3d8_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) + const struct wined3d_parent_ops **parent_ops) { IDirect3DBaseTexture8 *texture; surface->IDirect3DSurface8_iface.lpVtbl = &d3d8_surface_vtbl; d3d8_resource_init(&surface->resource); surface->resource.refcount = 0; - surface->wined3d_surface = wined3d_surface; list_init(&surface->rtv_entry); surface->container = wined3d_texture_get_parent(wined3d_texture); surface->wined3d_texture = wined3d_texture; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f00553a..7aa723e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1434,6 +1434,30 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct return WINED3D_OK; } +HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect_in, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect_in, DWORD flags, + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) +{ + struct wined3d_resource *dst_resource, *src_resource = NULL; + + TRACE("dst_texture %p, dst_sub_resource_idx %u, src_texture %p, src_sub_resource_idx %u.\n", + dst_texture, dst_sub_resource_idx, src_texture, src_sub_resource_idx); + + if (!(dst_resource = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx)) + || dst_resource->type != WINED3D_RTYPE_SURFACE) + return WINED3DERR_INVALIDCALL; + + if (src_texture) + { + if (!(src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx)) + || src_resource->type != WINED3D_RTYPE_SURFACE) + return WINED3DERR_INVALIDCALL; + } + + return wined3d_surface_blt(surface_from_resource(dst_resource), dst_rect_in, + src_resource ? surface_from_resource(src_resource) : NULL, src_rect_in, flags, fx, filter); +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD surface_flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index da1cbc4..9a266c9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -257,6 +257,7 @@ @ cdecl wined3d_swapchain_set_window(ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) +@ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) @ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr ptr) @ cdecl wined3d_texture_decref(ptr) @ cdecl wined3d_texture_generate_mipmaps(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cb412e4..6f98c34 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2527,6 +2527,9 @@ void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, H HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); +HRESULT __cdecl wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_idx, const RECT *dst_rect_in, + struct wined3d_texture *src_texture, unsigned int src_idx, const RECT *src_rect_in, DWORD flags, + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter); HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD surface_flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture);

1 0

Józef Kucia : d3d11: Implement ID3D10ShaderResourceView1 interface.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 6c96e0ac77ee6804909b254984c3278a437917cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c96e0ac77ee6804909b25498… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 19 01:41:58 2015 +0200 d3d11: Implement ID3D10ShaderResourceView1 interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 8 ++++---- dlls/d3d11/view.c | 49 +++++++++++++++++++++++++++++----------------- 3 files changed, 37 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c96e0ac77ee6804909b2…

1 0

Józef Kucia : dxgi: Make dxgi_swapchain_SetFullscreenState() hotpatchable.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: e79bf35933439800bd13b55c0cf7cc7505c05564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79bf35933439800bd13b55c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 19 01:58:59 2015 +0200 dxgi: Make dxgi_swapchain_SetFullscreenState() hotpatchable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f1495cb..a12e1e5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -178,10 +178,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, return hr; } -static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetFullscreenState(IDXGISwapChain *iface, +static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenState(IDXGISwapChain *iface, BOOL fullscreen, IDXGIOutput *target) { - FIXME("iface %p, fullscreen %u, target %p stub!\n", iface, fullscreen, target); + FIXME("iface %p, fullscreen %#x, target %p stub!\n", iface, fullscreen, target); return E_NOTIMPL; }

1 0

Dmitry Timoshkov : user32: Always call BeginPaint/ EndPaint when handling a WM_PAINT message for the button.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 0fe60f83d227bf70f6cb4a2d7983d6fd654edba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe60f83d227bf70f6cb4a2d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 19 20:16:50 2015 +0800 user32: Always call BeginPaint/EndPaint when handling a WM_PAINT message for the button. Python 3.5 installer creates windows with class "Button" that have 0x000e button style, that causes infinite painting loops and inability to draw the installer UI. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9a10b86..eeb3035 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -282,16 +282,18 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_PRINTCLIENT: case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); if (btnPaintFunc[btn_type]) { - PAINTSTRUCT ps; - HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); int nOldMode = SetBkMode( hdc, OPAQUE ); (btnPaintFunc[btn_type])( hWnd, hdc, ODA_DRAWENTIRE ); SetBkMode(hdc, nOldMode); /* reset painting mode */ - if( !wParam ) EndPaint( hWnd, &ps ); } + if ( !wParam ) EndPaint( hWnd, &ps ); break; + } case WM_KEYDOWN: if (wParam == VK_SPACE)

1 0

Sebastian Lackner : kernel32/tests: Add tests for GetPhysicallyInstalledSystemMemory.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 16a97953c0a3961fd03d8c9f0dcafd2e7824abcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a97953c0a3961fd03d8c9f0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 19 12:41:36 2015 +0200 kernel32/tests: Add tests for GetPhysicallyInstalledSystemMemory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index d8768da..136d618 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -39,6 +39,7 @@ #define HEAP_VALIDATE_PARAMS 0x40000000 static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); +static BOOL (WINAPI *pGetPhysicallyInstalledSystemMemory)(ULONGLONG *); static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); struct heap_layout @@ -1145,6 +1146,38 @@ static void test_child_heap( const char *arg ) test_heap_checks( expect_heap ); } +static void test_GetPhysicallyInstalledSystemMemory(void) +{ + HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); + MEMORYSTATUSEX memstatus; + ULONGLONG total_memory; + BOOL ret; + + pGetPhysicallyInstalledSystemMemory = (void *)GetProcAddress(kernel32, "GetPhysicallyInstalledSystemMemory"); + if (!pGetPhysicallyInstalledSystemMemory) + { + skip("GetPhysicallyInstalledSystemMemory is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pGetPhysicallyInstalledSystemMemory(NULL); + ok(!ret, "GetPhysicallyInstalledSystemMemory should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + total_memory = 0; + ret = pGetPhysicallyInstalledSystemMemory(&total_memory); + ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed\n"); + ok(total_memory != 0, "expected total_memory != 0\n"); + + memstatus.dwLength = sizeof(memstatus); + ret = GlobalMemoryStatusEx(&memstatus); + ok(ret, "GlobalMemoryStatusEx unexpectedly failed\n"); + ok(total_memory >= memstatus.ullTotalPhys / 1024, + "expected total_memory >= memstatus.ullTotalPhys / 1024\n"); +} + START_TEST(heap) { int argc; @@ -1172,7 +1205,9 @@ START_TEST(heap) test_sized_HeapReAlloc(1, (1 << 20)); test_sized_HeapReAlloc((1 << 20), (2 << 20)); test_sized_HeapReAlloc((1 << 20), 1); + test_HeapQueryInformation(); + test_GetPhysicallyInstalledSystemMemory(); if (pRtlGetNtGlobalFlags) {

1 0

Józef Kucia : d3d10core/tests: Check that shader resource views implement ID3D10ShaderResourceView1.
by Alexandre Julliard Oct. 19, 2015

Oct. 19, 2015

Module: wine Branch: master Commit: 0ce1d59a80c68685d8df74a83f87f0317cda0480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce1d59a80c68685d8df74a83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 19 01:42:00 2015 +0200 d3d10core/tests: Check that shader resource views implement ID3D10ShaderResourceView1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e899206..dadf113 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -926,6 +926,10 @@ static void test_create_shader_resource_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D10ShaderResourceView1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Shader resource view should implement ID3D11ShaderResourceView.\n"); @@ -960,6 +964,10 @@ static void test_create_shader_resource_view(void) U(srv_desc).Texture2D.MostDetailedMip); ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D10ShaderResourceView1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Shader resource view should implement ID3D11ShaderResourceView.\n");

1 0