May 2018 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Implement oMask register.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 9a9ecb9b118948fd30eb7ff7fad2edead3b7301e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9ecb9b118948fd30eb7ff7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 17 13:17:37 2018 +0200 wined3d: Implement oMask register. 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/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 6 ++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index da7e700..6f23cf8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3242,6 +3242,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "vpc[%u]", reg->idx[0].offset); break; + case WINED3DSPR_SAMPLEMASK: + sprintf(register_name, "sample_mask"); + break; + default: FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); @@ -7627,6 +7631,9 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in shader_glsl_generate_fog_code(buffer, gl_info, args->fog); shader_glsl_generate_alpha_test(buffer, gl_info, args->alpha_test_func + 1); + + if (reg_maps->sample_mask) + shader_addline(buffer, "gl_SampleMask[0] = floatBitsToInt(sample_mask);\n"); } /* Context activation is done by the caller. */ @@ -7822,6 +7829,9 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "void main()\n{\n"); + if (reg_maps->sample_mask) + shader_addline(buffer, "float sample_mask = uintBitsToFloat(0xffffffffu);\n"); + /* Direct3D applications expect integer vPos values, while OpenGL drivers * add approximately 0.5. This causes off-by-one problems as spotted by * the vPos d3d9 visual test. Unfortunately ATI cards do not add exactly diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 45ae04a..3a0a302 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -810,6 +810,10 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w reg_maps->vocp = 1; break; + case WINED3DSPR_SAMPLEMASK: + reg_maps->sample_mask = 1; + break; + default: TRACE("Not recording register of type %#x and [%#x][%#x].\n", reg->type, reg->idx[0].offset, reg->idx[1].offset); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b2e4372..f40d163 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1040,7 +1040,8 @@ struct wined3d_shader_reg_maps DWORD vocp : 1; DWORD input_rel_addressing : 1; DWORD viewport_array : 1; - DWORD padding : 15; + DWORD sample_mask : 1; + DWORD padding : 14; DWORD rt_mask; /* Used render targets, 32 max. */ @@ -4115,13 +4116,14 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) /* oPos */ return FALSE; + case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_DEPTHOUT: /* oDepth */ case WINED3DSPR_DEPTHOUTGE: case WINED3DSPR_DEPTHOUTLE: - case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */ case WINED3DSPR_PRIMID: /* primID */ + case WINED3DSPR_SAMPLEMASK: /* oMask */ return TRUE; case WINED3DSPR_MISCTYPE:

1 0

Matteo Bruni : d3d11/tests: Add a test for output sampler mask.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: b8f5dd96a5c8514ead5f6cf869298cc12ab271b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f5dd96a5c8514ead5f6cf8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 17 13:17:38 2018 +0200 d3d11/tests: Add a test for output sampler mask. 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/tests/d3d11.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9e673ee..b456629 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26816,6 +26816,78 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_sample_mask(void) +{ + static const DWORD ps_code[] = + { +#if 0 + float4 main(in float4 pos : SV_Position, out uint sample_mask : SV_Coverage) : SV_Target + { + sample_mask = 0x5; + return float4(1.0, 1.0, 1.0, 1.0); + } +#endif + 0x43425844, 0x196779a9, 0xda85988a, 0xb7f0a0b6, 0xb30dd6ba, 0x00000001, 0x00000114, 0x00000003, + 0x0000002c, 0x00000060, 0x000000b8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x00000050, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000042, 0x00000000, 0x00000000, 0x00000001, 0xffffffff, 0x00000e01, + 0x545f5653, 0x65677261, 0x56530074, 0x766f435f, 0x67617265, 0xabab0065, 0x58454853, 0x00000054, + 0x00000050, 0x00000015, 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x02000065, 0x0000f000, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x04000036, 0x0000f001, 0x00004001, 0x00000005, 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + UINT quality_levels; + HRESULT hr; + + if (!init_test_context(&test_context, &feature_level)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &quality_levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_levels) + { + skip("4xMSAA not supported.\n"); + release_test_context(&test_context); + return; + } + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.SampleDesc.Count = 4; + texture_desc.SampleDesc.Quality = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, black); + draw_quad(&test_context); + ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, + (ID3D11Resource *)texture, 0, texture_desc.Format); + check_texture_color(test_context.backbuffer, 0x7f7f7f7f, 1); + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + static void test_depth_clip(void) { struct d3d11_test_context test_context; @@ -27027,5 +27099,6 @@ START_TEST(d3d11) test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); + test_sample_mask(); test_depth_clip(); }

1 0

Alex Henrie : ntdll: Add LdrRegisterDllNotification stub.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 760ca4c05f5deb46530bc3ccbaea2f6a508c6649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=760ca4c05f5deb46530bc3cc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 15 05:50:49 2018 -0600 ntdll: Add LdrRegisterDllNotification stub. Based on a patch by Michael Müller. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 19 +++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ include/winternl.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a3dd80..3e00ec6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1462,6 +1462,25 @@ NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, } /****************************************************************** + * LdrRegisterDllNotification (NTDLL.@) + */ +NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FUNCTION callback, + void *context, void **cookie) +{ + FIXME( "(%04x, %p, %p, %p) stub\n", flags, callback, context, cookie ); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************** + * LdrUnregisterDllNotification (NTDLL.@) + */ +NTSTATUS WINAPI LdrUnregisterDllNotification( void *cookie ) +{ + FIXME( "(%p) stub\n", cookie ); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************** * LdrLockLoaderLock (NTDLL.@) * * Note: some flags are not implemented. diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e2f5117..66d4e7c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -83,6 +83,7 @@ @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall LdrRegisterDllNotification(long ptr ptr ptr) @ stdcall LdrResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber @@ -91,6 +92,7 @@ @ stub LdrUnloadAlternateResourceModule @ stdcall LdrUnloadDll(ptr) @ stdcall LdrUnlockLoaderLock(long long) +@ stdcall LdrUnregisterDllNotification(ptr) @ stub LdrVerifyImageMatchesChecksum @ extern NlsAnsiCodePage @ extern NlsMbCodePageTag diff --git a/include/winternl.h b/include/winternl.h index c84e6d7..9452f8c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,32 @@ typedef struct _LDR_MODULE HANDLE ActivationContext; } LDR_MODULE, *PLDR_MODULE; +typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA +{ + ULONG Flags; + const UNICODE_STRING *FullDllName; + const UNICODE_STRING *BaseDllName; + void *DllBase; + ULONG SizeOfImage; +} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; + +typedef struct _LDR_DLL_UNLOADED_NOTIFICATION_DATA +{ + ULONG Flags; + const UNICODE_STRING *FullDllName; + const UNICODE_STRING *BaseDllName; + void *DllBase; + ULONG SizeOfImage; +} LDR_DLL_UNLOADED_NOTIFICATION_DATA, *PLDR_DLL_UNLOADED_NOTIFICATION_DATA; + +typedef union _LDR_DLL_NOTIFICATION_DATA +{ + LDR_DLL_LOADED_NOTIFICATION_DATA Loaded; + LDR_DLL_UNLOADED_NOTIFICATION_DATA Unloaded; +} LDR_DLL_NOTIFICATION_DATA, *PLDR_DLL_NOTIFICATION_DATA; + +typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICATION_DATA*, void*); + /* those defines are (some of the) regular LDR_MODULE.Flags values */ #define LDR_IMAGE_IS_DLL 0x00000004 #define LDR_LOAD_IN_PROGRESS 0x00001000 @@ -2185,6 +2211,9 @@ typedef struct _LDR_MODULE /* flag for LdrAddRefDll */ #define LDR_ADDREF_DLL_PIN 0x00000001 +#define LDR_DLL_NOTIFICATION_REASON_LOADED 1 +#define LDR_DLL_NOTIFICATION_REASON_UNLOADED 2 + /* FIXME: to be checked */ #define MAXIMUM_FILENAME_LENGTH 256

1 0

Alexandre Julliard : user32: Store the window DPI in the server.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: f7b5b8975c20440c677fee63ab47e26c9d33ad9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7b5b8975c20440c677fee63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 17 13:56:26 2018 +0200 user32: Store the window DPI in the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 31 +++++++++-------------------- dlls/user32/tests/sysparams.c | 25 ++++++++++++++++++++++++ dlls/user32/win.c | 38 ++++++++++++++++++++++++++++++++++++ dlls/user32/win.h | 2 ++ include/wine/server_protocol.h | 10 +++++----- server/protocol.def | 4 ++++ server/request.h | 12 ++++++++---- server/trace.c | 4 ++++ server/window.c | 44 ++++++++++++++++++++++++++++++++---------- 9 files changed, 129 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7b5b8975c20440c677f…

1 0

Michael Müller : version: Return ERROR_FILE_NOT_FOUND for Win 9x when a file was not found in GetFileVersionInfoSize.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: df3dfa7baf2def12498d7d87d3dab4629eb90f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df3dfa7baf2def12498d7d87… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 17 04:20:52 2018 +0000 version: Return ERROR_FILE_NOT_FOUND for Win 9x when a file was not found in GetFileVersionInfoSize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 13436ca..f33361b 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -705,7 +705,12 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h return (len * 2) + 4; default: - SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND ); + if (lzfd == HFILE_ERROR) + SetLastError(ofs.nErrCode); + else if (GetVersion() & 0x80000000) /* Windows 95/98 */ + SetLastError(ERROR_FILE_NOT_FOUND); + else + SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); return 0; } }

1 0

Józef Kucia : d3d11/tests: Add test for sample shading.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: e9488b0490e694c71ac076c02f18ad9b83a9377c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9488b0490e694c71ac076c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 17 13:17:41 2018 +0200 d3d11/tests: Add test for sample shading. Verifies if pixel shader is executed per sample or per pixel. 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/tests/d3d11.c | 450 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 450 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9488b0490e694c71ac0…

1 0

Zebediah Figura : msi: Avoid leaking memory on failure paths in MsiGetPropertyA().
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 2e2934e455318c2753741a051876bc0a3c2399fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2934e455318c2753741a05… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 10:48:15 2018 -0500 msi: Avoid leaking memory on failure paths in MsiGetPropertyA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ab6c3dd..2801efa 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2368,9 +2368,14 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD DWORD len; if (!(remote = msi_get_remote(hinst))) + { + heap_free(nameW); return ERROR_INVALID_HANDLE; + } r = remote_GetProperty(remote, nameW, &value, &len); + heap_free(nameW); + if (!r) { /* String might contain embedded nulls. @@ -2388,7 +2393,6 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD heap_free(tmp); } midl_user_free(value); - heap_free(nameW); return r; }

1 0

Kyle Auble : Tighten up URL validation in news plugin
by Jeremy Newman May 17, 2018

May 17, 2018

Module: website Branch: master Commit: 5cd195b1ac9ff47e92b8b31526212c4915be048e URL: https://source.winehq.org/git/website.git/?a=commit;h=5cd195b1ac9ff47e92b8b… Author: Kyle Auble <kauble7(a)gmail.com> Date: Sat May 12 20:21:31 2018 -0400 Tighten up URL validation in news plugin >From d3a7af7eca5c14ec48202eef65e3d8eb55aee459 Mon Sep 17 00:00:00 2001 From: Kyle Auble <kauble7(a)gmail.com> Date: Thu, 10 May 2018 17:19:24 -0400 Subject: [PATCH website] Tighten up URL validation in news plugin Fixes https://bugs.winehq.org/show_bug.cgi?id=44764 Signed-off-by: Kyle Auble <kauble7(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/plugins/news.php | 59 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index 3d78b74..94f18e3 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -10,19 +10,53 @@ if (!empty($_GET['lang']) and in_array($_GET['lang'], $config->languages)) $html->lang = $_GET['lang']; -// display news based on page params -switch (true) +// Display news based on page params +// The news plugin expects a narrow range of options though... +// ... so scrub out anything except relevant values + +// If there are no potential parameters in the URL... +if (!defined('PAGE_PARAMS')) + $flag = 'default'; + +// If a specific date is referenced... +else if (preg_match("/[0-9]{10}/", PAGE_PARAMS, $matches)) +{ + $item = $matches[0] . '.xml'; + $vars = array(); + + // Ensure valid news actually exists for this date + if (file_exists($config->news_xml_path.'/'.$html->lang.'/'.$item)) + { + $vars = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); + $flag = 'single'; + } + else if (file_exists($config->news_xml_path.'/'.$config->lang.'/'.$item)) + { + $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); + $flag = 'single'; + } + else + $flag = 'default'; +} + +// If the RSS feed is requested specifically... +else if (preg_match("/rss/", PAGE_PARAMS)) +{ + $feed = 'xml'; + $flag = 'rss'; +} + +// Anything else... +else + $flag = 'default'; + +// Now handle the details based on the control flag +switch ($flag) { // single issue view - case (defined('PAGE_PARAMS') and preg_match("/[0-9]{10}/", PAGE_PARAMS)): + case 'single': - // get data from XML file - $item = PAGE_PARAMS . '.xml'; - $vars = array(); - if (file_exists($config->news_xml_path.'/'.$html->lang.'/'.$item)) - $vars = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); - else - $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); + // The single flag guarantees vars already has the news path // set open graph tags $html->meta_og['title'] = trim($vars['title']); @@ -57,12 +91,13 @@ switch (true) echo $html->template('base', 'news_row', $vars); echo $html->p($html->ahref('<span class="glyphicon glyphicon-backward"></span>', "{$html->_web_root}/news", 'class="btn btn-default"')); break; + // end single issue // RSS view - case (defined('PAGE_PARAMS') and PAGE_PARAMS == "rss"): + case 'rss': // get list of news items - $news = get_files($config->news_xml_path."/".$config->lang, "xml"); + $news = get_files($config->news_xml_path."/".$config->lang, $feed); $news = array_reverse ($news); // clear cache and output the rss file

1 0

Zhiyi Zhang : comctl32/taskdialog: Return TRUE when message is handled.
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: c5b469f7abf6a90abe5493a4385a099015132a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b469f7abf6a90abe5493a4… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Thu May 17 00:18:05 2018 +0300 comctl32/taskdialog: Return TRUE when message is handled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1ab9e13..4db4879 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -558,15 +558,17 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (HIWORD(wParam) == BN_CLICKED) { taskdialog_on_button_click(dialog_info, LOWORD(wParam)); - return TRUE; + break; } - break; + return FALSE; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); break; + default: + return FALSE; } - return FALSE; + return TRUE; } /***********************************************************************

1 0

Józef Kucia : d3d11/tests: Correctly check for multisample support.
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: 0e397cfd7bf9c9371b15111b6a76548be959c329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e397cfd7bf9c9371b15111b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:29 2018 +0200 d3d11/tests: Correctly check for multisample support. 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/tests/d3d11.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index fadcec4..9e673ee 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26254,7 +26254,8 @@ static void test_alpha_to_coverage(void) ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); hr = ID3D11Device_CheckMultisampleQualityLevels(device, texture_desc.Format, 4, &quality_level_count); - if (FAILED(hr)) + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!quality_level_count) { skip("4xMSAA not supported.\n"); goto done; @@ -26773,8 +26774,9 @@ static void test_multisample_resolve(void) device = test_context.device; context = test_context.immediate_context; - if (FAILED(hr = ID3D11Device_CheckMultisampleQualityLevels(device, - DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &i))) + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, &i); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + if (!i) { skip("4xMSAA not supported.\n"); release_test_context(&test_context);

1 0