January 2018 - Wine-Commits

Huw Davies : gdi32: Don't bother using the return value of HeapFree().
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 1def41b9039c5ffe6a79e04b24c6920225f6e30b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1def41b9039c5ffe6a79e04b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:53:38 2018 +0000 gdi32: Don't bother using the return value of HeapFree(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 3 ++- dlls/gdi32/brush.c | 3 ++- dlls/gdi32/dib.c | 3 ++- dlls/gdi32/dibdrv/opengl.c | 3 ++- dlls/gdi32/enhmetafile.c | 3 ++- dlls/gdi32/font.c | 3 ++- dlls/gdi32/metafile.c | 4 +++- dlls/gdi32/palette.c | 3 ++- dlls/gdi32/pen.c | 3 ++- 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 768911a..c16793d 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -489,7 +489,8 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) if (!bmp) return FALSE; HeapFree( GetProcessHeap(), 0, bmp->dib.dsBm.bmBits ); - return HeapFree( GetProcessHeap(), 0, bmp ); + HeapFree( GetProcessHeap(), 0, bmp ); + return TRUE; } diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 3c11243..7d13649 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -467,7 +467,8 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) if (!brush) return FALSE; free_brush_pattern( &brush->pattern ); - return HeapFree( GetProcessHeap(), 0, brush ); + HeapFree( GetProcessHeap(), 0, brush ); + return TRUE; } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2eb0e91..c7dcdb1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1831,5 +1831,6 @@ static BOOL DIB_DeleteObject( HGDIOBJ handle ) else VirtualFree( bmp->dib.dsBm.bmBits, 0, MEM_RELEASE ); HeapFree(GetProcessHeap(), 0, bmp->color_table); - return HeapFree( GetProcessHeap(), 0, bmp ); + HeapFree( GetProcessHeap(), 0, bmp ); + return TRUE; } diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 20cfc02..dba5db0 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -217,7 +217,8 @@ static struct wgl_context *dibdrv_wglCreateContext( HDC hdc ) static BOOL dibdrv_wglDeleteContext( struct wgl_context *context ) { pOSMesaDestroyContext( context->context ); - return HeapFree( GetProcessHeap(), 0, context ); + HeapFree( GetProcessHeap(), 0, context ); + return TRUE; } /*********************************************************************** diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 111fa43..37edc23 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -287,7 +287,8 @@ static BOOL EMF_Delete_HENHMETAFILE( HENHMETAFILE hmf ) UnmapViewOfFile( metaObj->emh ); else HeapFree( GetProcessHeap(), 0, metaObj->emh ); - return HeapFree( GetProcessHeap(), 0, metaObj ); + HeapFree( GetProcessHeap(), 0, metaObj ); + return TRUE; } /****************************************************************** diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d059f97..17b160d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -811,7 +811,8 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) FONTOBJ *obj; if (!(obj = free_gdi_handle( handle ))) return FALSE; - return HeapFree( GetProcessHeap(), 0, obj ); + HeapFree( GetProcessHeap(), 0, obj ); + return TRUE; } diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index c7e25a7..28ad53c 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -135,8 +135,10 @@ static POINT *convert_points( UINT count, const POINTS *pts ) BOOL WINAPI DeleteMetaFile( HMETAFILE hmf ) { METAHEADER *mh = free_gdi_handle( hmf ); + if (!mh) return FALSE; - return HeapFree( GetProcessHeap(), 0, mh ); + HeapFree( GetProcessHeap(), 0, mh ); + return TRUE; } /****************************************************************** diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a8135d5..52bd0d3 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -610,7 +610,8 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) PALETTE_UnrealizeObject( handle ); if (!(obj = free_gdi_handle( handle ))) return FALSE; HeapFree( GetProcessHeap(), 0, obj->entries ); - return HeapFree( GetProcessHeap(), 0, obj ); + HeapFree( GetProcessHeap(), 0, obj ); + return TRUE; } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index d6c1dc4..fa789e4 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -279,7 +279,8 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle ) if (!pen) return FALSE; free_brush_pattern( &pen->pattern ); - return HeapFree( GetProcessHeap(), 0, pen ); + HeapFree( GetProcessHeap(), 0, pen ); + return TRUE; }

1 0

Józef Kucia : dxgi: Set BufferUsage in dxgi_swapchain_GetDesc().
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 6141647a52a32c5efb0322d388e12944068ecf63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6141647a52a32c5efb0322d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:52 2018 +0100 dxgi: Set BufferUsage in dxgi_swapchain_GetDesc(). 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/d3d10_1/tests/d3d10_1.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/dxgi/swapchain.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 47c7c86..2b18110 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -189,7 +189,7 @@ static void test_create_device(void) "Got unexpected SampleDesc.Count %u.\n", obtained_desc.SampleDesc.Count); ok(obtained_desc.SampleDesc.Quality == swapchain_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", obtained_desc.SampleDesc.Quality); - todo_wine ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage, + ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage, "Got unexpected BufferUsage %#x.\n", obtained_desc.BufferUsage); ok(obtained_desc.BufferCount == swapchain_desc.BufferCount, "Got unexpected BufferCount %u.\n", obtained_desc.BufferCount); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index dca2515..19e428c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1548,7 +1548,7 @@ static void test_create_device(void) "Got unexpected SampleDesc.Count %u.\n", obtained_desc.SampleDesc.Count); ok(obtained_desc.SampleDesc.Quality == swapchain_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", obtained_desc.SampleDesc.Quality); - todo_wine ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage, + ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage, "Got unexpected BufferUsage %#x.\n", obtained_desc.BufferUsage); ok(obtained_desc.BufferCount == swapchain_desc.BufferCount, "Got unexpected BufferCount %u.\n", obtained_desc.BufferCount); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index eca68c3..ec9b2b4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -285,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface, wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring ScanlineOrdering, Scaling and SwapEffect.\n"); + FIXME("Ignoring ScanlineOrdering, Scaling, BufferUsage and SwapEffect.\n"); desc->BufferDesc.Width = wined3d_desc.backbuffer_width; desc->BufferDesc.Height = wined3d_desc.backbuffer_height; @@ -295,6 +295,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); + desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed;

1 0

Alexandre Julliard : ntdll: Move suspending a thread on startup back to the platform-specific files.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 9d911a5736e12fbafdfb4df9870dfb386dd8e888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d911a5736e12fbafdfb4df9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 15:17:25 2018 +0100 ntdll: Move suspending a thread on startup back to the platform-specific files. This partially reverts f64d2688d20952fb0085deeba98c952fd8bf1497. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +--- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 3 ++- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 3 ++- dlls/ntdll/signal_x86_64.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fe02b6c..2b0fefc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2963,14 +2963,12 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) * Attach to all the loaded dlls. * If this is the first time, perform the full process initialization. */ -NTSTATUS attach_dlls( CONTEXT *context, BOOL suspend ) +NTSTATUS attach_dlls( CONTEXT *context ) { NTSTATUS status; WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if (suspend) wait_suspend( context ); - pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); if (process_detaching) return STATUS_SUCCESS; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 32a385f..e32ea61 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -106,7 +106,7 @@ extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS attach_dlls( CONTEXT *context, BOOL suspend ) DECLSPEC_HIDDEN; +extern NTSTATUS attach_dlls( CONTEXT *context ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 355817b..d60c2a9 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1286,7 +1286,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, FALSE ); + attach_dlls( ctx ); return ctx; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 57ec13a..d6ec376 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1016,7 +1016,8 @@ static void thread_startup( void *param ) context.Sp = (DWORD_PTR)NtCurrentTeb()->Tib.StackBase; context.Pc = (DWORD_PTR)info->start; - attach_dlls( &context, info->suspend ); + if (info->suspend) wait_suspend( &context ); + attach_dlls( &context ); ((thread_start_func)context.Pc)( (LPTHREAD_START_ROUTINE)context.u.s.X0, (void *)context.u.s.X1 ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9bf36c1..8b91019 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2996,7 +2996,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, FALSE ); + attach_dlls( ctx ); return ctx; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 3182a13..d69c616 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1178,7 +1178,8 @@ static void thread_startup( void *param ) context.Gpr4 = (DWORD)info->arg; context.Iar = (DWORD)info->start; - attach_dlls( &context, info->suspend ); + if (info->suspend) wait_suspend( &context ); + attach_dlls( &context ); ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 946c0f1..abd3174 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4169,7 +4169,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, FALSE ); + attach_dlls( ctx ); return ctx; }

1 0

Józef Kucia : d3d11: Prefer D3D11 interfaces.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: bb5c90d9671a0b736ea74287e9ab2dd3382f4152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb5c90d9671a0b736ea74287… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:51 2018 +0100 d3d11: Prefer D3D11 interfaces. 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 | 20 ++++++++++---------- dlls/d3d11/texture.c | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e7fd3a7..a184b93 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -126,9 +126,9 @@ struct d3d_texture2d ID3D11Device *device; }; -static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) { - return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface); + return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D11Texture2D_iface); } HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b2a40b3..86778f3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5767,8 +5767,8 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); struct d3d_texture2d *texture; - ID3D10Texture2D *texture_iface; - D3D10_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture_iface; + D3D11_TEXTURE2D_DESC desc; HRESULT hr; FIXME("device_parent %p, container_parent %p, wined3d_desc %p, texture flags %#x, " @@ -5784,32 +5784,32 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic desc.Format = dxgi_format_from_wined3dformat(wined3d_desc->format); desc.SampleDesc.Count = wined3d_desc->multisample_type ? wined3d_desc->multisample_type : 1; desc.SampleDesc.Quality = wined3d_desc->multisample_quality; - desc.Usage = D3D10_USAGE_DEFAULT; - desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MiscFlags = 0; if (texture_flags & WINED3D_TEXTURE_CREATE_GET_DC) { - desc.MiscFlags |= D3D10_RESOURCE_MISC_GDI_COMPATIBLE; + desc.MiscFlags |= D3D11_RESOURCE_MISC_GDI_COMPATIBLE; texture_flags &= ~WINED3D_TEXTURE_CREATE_GET_DC; } if (texture_flags) FIXME("Unhandled flags %#x.\n", texture_flags); - if (FAILED(hr = d3d10_device_CreateTexture2D(&device->ID3D10Device1_iface, + if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device_iface, &desc, NULL, &texture_iface))) { - WARN("CreateTexture2D failed, returning %#x.\n", hr); + WARN("Failed to create 2D texture, hr %#x.\n", hr); return hr; } - texture = impl_from_ID3D10Texture2D(texture_iface); + texture = impl_from_ID3D11Texture2D(texture_iface); *wined3d_texture = texture->wined3d_texture; wined3d_texture_incref(*wined3d_texture); - ID3D10Texture2D_Release(&texture->ID3D10Texture2D_iface); + ID3D11Texture2D_Release(&texture->ID3D11Texture2D_iface); return S_OK; } @@ -5823,7 +5823,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - if (FAILED(hr = d3d10_device_QueryInterface(&device->ID3D10Device1_iface, + if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device_iface, &IID_IWineDXGIDevice, (void **)&wine_device))) { ERR("Device should implement IWineDXGIDevice.\n"); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 17fb4b1..2644b52 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -27,11 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11Texture2D methods */ -static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D11Texture2D_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); @@ -251,6 +246,11 @@ struct d3d_texture2d *unsafe_impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) /* IUnknown methods */ +static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D10Texture2D(iface);

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetDesc1 ().
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 0e4250c59581b2d6e893b6f4c3bbbe93eabd134f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4250c59581b2d6e893b6f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:54 2018 +0100 dxgi: Implement dxgi_swapchain_GetDesc1(). 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 | 32 ++++++++++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 10 ++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ec9b2b4..fe7e5cc 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -429,9 +429,37 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetLastPresentCount(IDXGISwapCha static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, DXGI_SWAP_CHAIN_DESC1 *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc wined3d_desc; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + FIXME("Ignoring Stereo, BufferUsage, Scaling, SwapEffect and AlphaMode.\n"); + + desc->Width = wined3d_desc.backbuffer_width; + desc->Height = wined3d_desc.backbuffer_height; + desc->Format = dxgi_format_from_wined3dformat(wined3d_desc.backbuffer_format); + desc->Stereo = FALSE; + dxgi_sample_desc_from_wined3d(&desc->SampleDesc, + wined3d_desc.multisample_type, wined3d_desc.multisample_quality); + desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc->BufferCount = wined3d_desc.backbuffer_count; + desc->Scaling = DXGI_SCALING_STRETCH; + desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->AlphaMode = DXGI_ALPHA_MODE_IGNORE; + desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenDesc(IDXGISwapChain1 *iface, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 18306db..ea10ff5 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -868,6 +868,7 @@ static void test_create_swapchain(void) struct swapchain_fullscreen_state initial_state, expected_state; unsigned int i, expected_width, expected_height; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; IDXGIDevice *device, *bgra_device; ULONG refcount, expected_refcount; IUnknown *obj, *obj2, *parent; @@ -968,6 +969,15 @@ static void test_create_swapchain(void) "Failed to query IDXGISwapChain1 interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) { + hr = IDXGISwapChain1_GetDesc1(swapchain1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain1_GetDesc1(swapchain1, &swapchain_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!swapchain_desc.Stereo, "Got unexpected stereo %#x.\n", swapchain_desc.Stereo); + ok(swapchain_desc.Scaling == DXGI_SCALING_STRETCH, + "Got unexpected scaling %#x.\n", swapchain_desc.Scaling); + ok(swapchain_desc.AlphaMode == DXGI_ALPHA_MODE_IGNORE, + "Got unexpected alpha mode %#x.\n", swapchain_desc.AlphaMode); hr = IDXGISwapChain1_GetHwnd(swapchain1, &window); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(window == creation_desc.OutputWindow, "Got unexpected window %p.\n", window);

1 0

Henri Verbeet : d2d1: Introduce a registry key to limit the maximum supported factory version.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 8247c13aaed2586948e70d124931d2ae15a2d279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8247c13aaed2586948e70d12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 22 15:58:46 2018 +0330 d2d1: Introduce a registry key to limit the maximum supported factory version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 6 ++++ dlls/d2d1/factory.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 51b9627..20d3f26 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -1,6 +1,6 @@ MODULE = d2d1.dll IMPORTLIB = d2d1 -IMPORTS = d3d10_1 dxguid uuid gdi32 user32 +IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 DELAYIMPORTS = dwrite C_SRCS = \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3b21bc1..f876cbf 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -52,6 +52,12 @@ enum d2d_shape_type D2D_SHAPE_TYPE_COUNT, }; +struct d2d_settings +{ + unsigned int max_version_factory; +}; +extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; + struct d2d_clip_stack { D2D1_RECT_F *stack; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index da2b892..f202332 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -22,8 +22,14 @@ #define D2D1_INIT_GUID #include "d2d1_private.h" +WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DEFAULT_DEBUG_CHANNEL(d2d); +struct d2d_settings d2d_settings = +{ + ~0u, /* No ID2D1Factory version limit by default. */ +}; + struct d2d_factory { ID2D1Factory1 ID2D1Factory1_iface; @@ -62,7 +68,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1Factory1) + if ((IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { @@ -537,3 +543,71 @@ void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_ matrix->_31 = center.x - center.x * cos_theta + center.y * sin_theta; matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; } + +static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) +{ + DWORD type, data, size; + + size = sizeof(data); + if (application_key && !RegQueryValueExA(application_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + size = sizeof(data); + if (default_key && !RegQueryValueExA(default_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + return FALSE; + +success: + *value = data; + return TRUE; +} + +static void d2d_settings_init(void) +{ + HKEY default_key, tmp_key, application_key = NULL; + char buffer[MAX_PATH + 10]; + DWORD len; + + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Direct2D", &default_key)) + default_key = NULL; + + len = GetModuleFileNameA(0, buffer, MAX_PATH); + if (len && len < MAX_PATH) + { + char *p, *appname = buffer; + + if ((p = strrchr(appname, '/'))) + appname = p + 1; + if ((p = strrchr(appname, '\\'))) + appname = p + 1; + strcat(appname, "\\Direct2D"); + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmp_key)) + { + if (RegOpenKeyA(tmp_key, appname, &application_key)) + application_key = NULL; + RegCloseKey(tmp_key); + } + } + + if (!default_key && !application_key) + return; + + if (get_config_key_dword(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) + ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory); + + if (application_key) + RegCloseKey(application_key); + if (default_key) + RegCloseKey(default_key); +} + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + d2d_settings_init(); + return TRUE; +}

1 0

Martin Storsjo : ntdll: Implement NtFlushInstructionCache using __clear_cache where available.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 4415653f842ae145178703a643cc1f62ee70b648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4415653f842ae145178703a6… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:05:09 2018 +0200 ntdll: Implement NtFlushInstructionCache using __clear_cache where available. The configure check needs to be done with a more elaborate test than just AC_CHECK_FUNC, since it's a built-in function in clang and errors out if invoked with no parameters. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 8 ++++++++ dlls/ntdll/process.c | 24 ++++++++++++++---------- include/config.h.in | 4 ++++ 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/configure b/configure index f62b9e3..bcba635 100755 --- a/configure +++ b/configure @@ -17759,6 +17759,39 @@ $as_echo "#define HAVE___BUILTIN_POPCOUNT 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __clear_cache" >&5 +$as_echo_n "checking for __clear_cache... " >&6; } +if ${ac_cv_have___clear_cache+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +__clear_cache((void*)0, (void*)0); return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_have___clear_cache="yes" +else + ac_cv_have___clear_cache="no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___clear_cache" >&5 +$as_echo "$ac_cv_have___clear_cache" >&6; } +if test "$ac_cv_have___clear_cache" = "yes" +then + +$as_echo "#define HAVE___CLEAR_CACHE 1" >>confdefs.h + +fi + case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __i386__" >&5 diff --git a/configure.ac b/configure.ac index 9aa3228..db666b9 100644 --- a/configure.ac +++ b/configure.ac @@ -2706,6 +2706,14 @@ then AC_DEFINE(HAVE___BUILTIN_POPCOUNT, 1, [Define to 1 if you have the `__builtin_popcount' built-in function.]) fi +AC_CACHE_CHECK([for __clear_cache], ac_cv_have___clear_cache, + AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[__clear_cache((void*)0, (void*)0); return 0;]])], + [ac_cv_have___clear_cache="yes"], [ac_cv_have___clear_cache="no"])) +if test "$ac_cv_have___clear_cache" = "yes" +then + AC_DEFINE(HAVE___CLEAR_CACHE, 1, [Define to 1 if you have the `__clear_cache' (potentially built-in) function.]) +fi + dnl *** check for the need to define platform-specific symbols case $host_cpu in diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index f615ce2..40034b4 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -653,20 +653,24 @@ NTSTATUS WINAPI NtSetInformationProcess( * NtFlushInstructionCache [NTDLL.@] * ZwFlushInstructionCache [NTDLL.@] */ -NTSTATUS WINAPI NtFlushInstructionCache( - IN HANDLE ProcessHandle, - IN LPCVOID BaseAddress, - IN SIZE_T Size) +NTSTATUS WINAPI NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T size ) { - static int once; - if (!once++) - { #if defined(__x86_64__) || defined(__i386__) - TRACE("%p %p %ld - no-op on x86 and x86_64\n", ProcessHandle, BaseAddress, Size ); + /* no-op */ +#elif defined(HAVE___CLEAR_CACHE) + if (handle == GetCurrentProcess()) + { + __clear_cache( (char *)addr, (char *)addr + size ); + } + else + { + static int once; + if (!once++) FIXME( "%p %p %ld other process not supported\n", handle, addr, size ); + } #else - FIXME("%p %p %ld\n", ProcessHandle, BaseAddress, Size ); + static int once; + if (!once++) FIXME( "%p %p %ld\n", handle, addr, size ); #endif - } return STATUS_SUCCESS; } diff --git a/include/config.h.in b/include/config.h.in index 9224837..4db349c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1407,6 +1407,10 @@ /* Define to 1 if you have the `__builtin_popcount' built-in function. */ #undef HAVE___BUILTIN_POPCOUNT +/* Define to 1 if you have the `__clear_cache' (potentially built-in) + function. */ +#undef HAVE___CLEAR_CACHE + /* Define to 1 if you have the `__res_getservers' function. */ #undef HAVE___RES_GETSERVERS

1 0

Alexandre Julliard : server: Only update the modified parts of the context on thread suspend.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 03d31ea81db4fe4ca3c534dc460115fb3cfeb9af URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d31ea81db4fe4ca3c534dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 13:11:56 2018 +0100 server: Only update the modified parts of the context on thread suspend. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 7 ++++++- include/wine/server_protocol.h | 2 +- server/thread.c | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index daca45a..f853810 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -110,6 +110,7 @@ void wait_suspend( CONTEXT *context ) LARGE_INTEGER timeout; int saved_errno = errno; context_t server_context; + DWORD flags = context->ContextFlags; context_to_server( &server_context, context ); @@ -130,10 +131,14 @@ void wait_suspend( CONTEXT *context ) { wine_server_set_reply( req, &server_context, sizeof(server_context) ); wine_server_call( req ); + if (wine_server_reply_size( reply )) + { + context_from_server( context, &server_context ); + context->ContextFlags |= flags; /* unchanged registers are still available */ + } } SERVER_END_REQ; - context_from_server( context, &server_context ); errno = saved_errno; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d0d074..ba9f66f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -6496,6 +6496,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 547 +#define SERVER_PROTOCOL_VERSION 548 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/thread.c b/server/thread.c index 2f65c16..e313dfe 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1715,7 +1715,10 @@ DECL_HANDLER(get_suspend_context) if (current->suspend_context) { - set_reply_data_ptr( current->suspend_context, sizeof(context_t) ); + if (current->suspend_context->flags) + set_reply_data_ptr( current->suspend_context, sizeof(context_t) ); + else + free( current->suspend_context ); if (current->context == current->suspend_context) { current->context = NULL; @@ -1745,6 +1748,7 @@ DECL_HANDLER(set_suspend_context) else if ((current->suspend_context = mem_alloc( sizeof(context_t) ))) { memcpy( current->suspend_context, get_req_data(), sizeof(context_t) ); + current->suspend_context->flags = 0; /* to keep track of what is modified */ current->context = current->suspend_context; if (current->debug_break) break_thread( current ); }

1 0

Hans Leidekker : msi: Write registry values for source components too.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 8bdcaf60367084c06c77cefb21ead8b3f13e5731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bdcaf60367084c06c77cefb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 22 10:19:06 2018 +0100 msi: Write registry values for source components too. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- dlls/msi/tests/action.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 54295a3..71e45e8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2872,7 +2872,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_LOCAL) + if (comp->Action != INSTALLSTATE_LOCAL && comp->Action != INSTALLSTATE_SOURCE) { TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 11e244c..31cc981 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -506,7 +506,22 @@ static const char wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\t\taugustus\n"; + "augustus\t\tMSITESTDIR\t0\t\taugustus\n" + "caesar\t\tMSITESTDIR\t1\t\t\n"; + +static const char wrv_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\tFeature\tFeature\t2\t1\tTARGETDIR\t0\n" + "feature2\t\tFeature2\tFeature2\t2\t1\tTARGETDIR\t1"; + +static const char wrv_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\taugustus\n" + "feature2\tcaesar"; static const char wrv_registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" @@ -527,7 +542,8 @@ static const char wrv_registry_dat[] = "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" - "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n"; + "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n" + "regdata16\t2\tSOFTWARE\\Wine\\msitest\tValue12\t#1\tcaesar\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -1752,8 +1768,8 @@ static const msi_table wrv_tables[] = { ADD_TABLE(wrv_component), ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(ci2_feature_comp), + ADD_TABLE(wrv_feature), + ADD_TABLE(wrv_feature_comp), ADD_TABLE(ci2_file), ADD_TABLE(install_exec_seq), ADD_TABLE(rof_media), @@ -4988,7 +5004,7 @@ static void test_write_registry_values(void) goto error; } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); if (is_64bit) @@ -5111,6 +5127,15 @@ static void test_write_registry_values(void) ok(size == 1, "got %u\n", size); ok(type == REG_BINARY, "got %u\n", type); + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value12", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); + ok(size == 4, "got %u\n", size); + ok(type == REG_DWORD, "got %u\n", type); + RegDeleteValueA(hkey, "Value"); RegDeleteValueA(hkey, "Value1"); RegDeleteValueA(hkey, "Value2"); @@ -5123,6 +5148,7 @@ static void test_write_registry_values(void) RegDeleteValueA(hkey, "Value9"); RegDeleteValueA(hkey, "Value10"); RegDeleteValueA(hkey, "Value11"); + RegDeleteValueA(hkey, "Value12"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0

Józef Kucia : dxgi/tests: Zero swapchain descriptions.
by Alexandre Julliard Jan. 22, 2018

Jan. 22, 2018

Module: wine Branch: master Commit: 90db63ab2de48bb3869d6de66701ad88fc1c0ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90db63ab2de48bb3869d6de6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:53 2018 +0100 dxgi/tests: Zero swapchain descriptions. 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/tests/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 77b7cb7..18306db 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -2604,6 +2604,7 @@ static void test_swapchain_resize(void) ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(swapchain_desc.BufferDesc.Width == 640, @@ -2668,6 +2669,7 @@ static void test_swapchain_resize(void) ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(swapchain_desc.BufferDesc.Width == 640, @@ -2738,6 +2740,7 @@ static void test_swapchain_resize(void) ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(swapchain_desc.BufferDesc.Width == 320, @@ -2800,6 +2803,7 @@ static void test_swapchain_resize(void) hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); ok(SUCCEEDED(hr), "Failed to resize buffers, hr %#x.\n", hr); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(swapchain_desc.BufferDesc.Width == client_rect.right - client_rect.left,

1 0