January 2019 - Wine-commits

Zebediah Figura : ntoskrnl.exe: Properly handle already-loaded drivers in handle_bus_relations().
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: wine Branch: master Commit: 48504a2cc7f6b0c6f66d0ae4a76c8b01130234bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=48504a2cc7f6b0c6f66d0ae4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 14 20:29:52 2019 -0600 ntoskrnl.exe: Properly handle already-loaded drivers in handle_bus_relations(). This fixes a regression introduced by d498780294c635f67aee823bc030151a6b75bee4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46469 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8a87a6..c46418e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3758,9 +3758,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) strcatW( buffer, driver ); RtlInitUnicodeString( &string, buffer ); status = ZwLoadDriver( &string ); - if (status == STATUS_IMAGE_ALREADY_LOADED) - return; - else if (status != STATUS_SUCCESS) + if (status != STATUS_SUCCESS && status != STATUS_IMAGE_ALREADY_LOADED) { ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) ); return;

1 0

Sven Baars : wbemprox/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: wine Branch: master Commit: b9eaf07111f518c8fe6728c91c6b71e6e1938953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9eaf07111f518c8fe6728c9… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Jan 14 20:15:43 2019 +0100 wbemprox/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 95690cf..0fa6b5e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1544,6 +1544,7 @@ static void test_Win32_IP4RouteTable( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); } @@ -1656,6 +1657,7 @@ static void test_Win32_Processor( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); } @@ -1731,6 +1733,7 @@ static void test_Win32_VideoController( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); } @@ -1796,6 +1799,7 @@ static void test_Win32_Printer( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); }

1 0

Thomas Faber : msxml3: Handle libxml2 API breakage.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: wine Branch: master Commit: 2a8719d280c9fcb87633f89b1d4c016378a28121 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a8719d280c9fcb87633f89b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Jan 9 12:33:37 2019 +0100 msxml3: Handle libxml2 API breakage. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/schema.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 8087985..e385b9b 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -52,6 +52,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#if LIBXML_VERSION >= 20908 +#define XMLHASH_CONST const +#else +#define XMLHASH_CONST +#endif + /* We use a chained hashtable, which can hold any number of schemas * TODO: grow/shrink hashtable depending on load factor * TODO: implement read-only where appropriate @@ -980,7 +986,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM return entry; } -static void cache_free(void* data, xmlChar* name /* ignored */) +static void cache_free(void* data, XMLHASH_CONST xmlChar* name /* ignored */) { cache_entry_release((cache_entry*)data); } @@ -1397,7 +1403,7 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if return S_OK; } -static void cache_copy(void* data, void* dest, xmlChar* name) +static void cache_copy(void* data, void* dest, XMLHASH_CONST xmlChar* name) { schema_cache* This = (schema_cache*) dest; cache_entry* entry = (cache_entry*) data;

1 0

Henri Verbeet : wined3d: Allow multisample destination textures in the GLSL blitter.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: wine Branch: master Commit: 347743fad5312249c5d8769f7eef12c4d9c379ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=347743fad5312249c5d8769f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 15 16:35:11 2019 +0330 wined3d: Allow multisample destination textures in the GLSL blitter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46459 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d6fd565..3298a60 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13127,11 +13127,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; if (src_texture->target == GL_TEXTURE_2D_MULTISAMPLE - || dst_texture->target == GL_TEXTURE_2D_MULTISAMPLE - || src_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY - || dst_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY) + || src_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY) { - TRACE("Multi-sample textures not supported.\n"); + TRACE("Multi-sample source textures not supported.\n"); return FALSE; }

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: wine Branch: master Commit: 56eac4bd8a5f23f39c81788ea1ee0a1822ebdf7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=56eac4bd8a5f23f39c81788e… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Jan 15 11:45:57 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 117 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 49 deletions(-) diff --git a/po/si.po b/po/si.po index 013abac..258bf9c 100644 --- a/po/si.po +++ b/po/si.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-01-12 06:10+0530\n" +"PO-Revision-Date: 2019-01-15 11:59+0530\n" "Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" "Language-Team: Sinhala\n" "Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Lokalize 18.12.1\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -98,7 +98,7 @@ msgstr "සහාය දුරකතනය:" #: appwiz.rc:85 msgid "Readme:" -msgstr "" +msgstr "කියවන්න:" #: appwiz.rc:86 msgid "Product Updates:" @@ -336,7 +336,7 @@ msgstr "ඉවර කරන්න" #: comctl32.rc:97 msgid "Customize Toolbar" -msgstr "" +msgstr "මෙවලම් තීරුව අභිමතකරණය කරන්න" #: comctl32.rc:100 comctl32.rc:57 cryptui.rc:356 ieframe.rc:43 oleview.rc:83 #: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 @@ -532,11 +532,11 @@ msgstr "" #: comdlg32.rc:236 msgid "Po&rtrait" -msgstr "" +msgstr "සිරස් (&R)" #: comdlg32.rc:237 comdlg32.rc:442 wineps.rc:37 msgid "&Landscape" -msgstr "" +msgstr "තිරස් (&L)" #: comdlg32.rc:240 comdlg32.rc:415 comdlg32.rc:435 wineps.rc:28 msgid "Paper" @@ -625,12 +625,12 @@ msgstr "පැහැය (&H):" #: comdlg32.rc:296 msgctxt "Saturation" msgid "&Sat:" -msgstr "" +msgstr "සන්තෘප්තිය (&S):" #: comdlg32.rc:298 msgctxt "Luminance" msgid "&Lum:" -msgstr "" +msgstr "දීප්තිය (&L):" #: comdlg32.rc:308 msgid "&Add to Custom Colors" @@ -755,11 +755,11 @@ msgstr "" #: comdlg32.rc:423 msgid "P&ortrait" -msgstr "" +msgstr "සිරස් (&O)" #: comdlg32.rc:424 msgid "L&andscape" -msgstr "" +msgstr "තිරස් (&A)" #: comdlg32.rc:429 msgid "Setup Page" @@ -771,7 +771,7 @@ msgstr "" #: comdlg32.rc:441 wineps.rc:35 msgid "&Portrait" -msgstr "" +msgstr "සිරස් (&P)" #: comdlg32.rc:444 msgid "L&eft:" @@ -871,7 +871,7 @@ msgstr "" #: comdlg32.rc:46 msgid "Create New Folder" -msgstr "" +msgstr "අලුත් ෆෝල්ඩරයක් හදන්න" #: comdlg32.rc:47 msgid "List" @@ -1047,7 +1047,7 @@ msgstr "ගොනුව අරින්න" #: comdlg32.rc:147 msgid "Select Folder" -msgstr "" +msgstr "ෆෝල්ඩරය තෝරන්න" #: comdlg32.rc:148 msgid "Font size has to be a number." @@ -1347,7 +1347,7 @@ msgstr "" #: crypt32.rc:61 msgid "Certificate Type" -msgstr "" +msgstr "සහතික වර්ගය" #: crypt32.rc:62 msgid "Certificate Manifold" @@ -1827,7 +1827,7 @@ msgstr "" #: crypt32.rc:189 msgid "URL=" -msgstr "" +msgstr "URL=" #: crypt32.rc:190 msgid "IP Address=" @@ -2026,7 +2026,7 @@ msgstr "අත්සන" #: crypt32.rc:238 msgid "SSL CA" -msgstr "" +msgstr "SSL සහතික අධිකාරිය" #: crypt32.rc:239 msgid "S/MIME CA" @@ -2034,7 +2034,7 @@ msgstr "" #: crypt32.rc:240 msgid "Signature CA" -msgstr "CA අත්සන" +msgstr "අත්සනේ සහතික අධිකාරිය" #: cryptdlg.rc:30 msgid "Certificate Policy" @@ -3132,7 +3132,7 @@ msgstr "" #: hhctrl.rc:42 msgid "Show" -msgstr "" +msgstr "පෙන්නන්න" #: hhctrl.rc:43 winemac.rc:34 msgid "Hide" @@ -3767,7 +3767,7 @@ msgstr "" #: winerror.mc:143 msgid "CRC error.\n" -msgstr "" +msgstr "CRC දෝෂයක්.\n" #: winerror.mc:148 msgid "Bad length.\n" @@ -6850,7 +6850,7 @@ msgstr "" #: msi.rc:97 msgid "Creating folders" -msgstr "" +msgstr "ෆෝල්ඩර හදනවා" #: msi.rc:98 msgid "Creating shortcuts" @@ -8272,7 +8272,7 @@ msgstr "" #: shell32.rc:32 shell32.rc:47 shell32.rc:124 shell32.rc:164 msgid "&List" -msgstr "" +msgstr "ලැයිස්තුව (&L)" #: shell32.rc:33 shell32.rc:48 shell32.rc:125 shell32.rc:165 taskmgr.rc:67 #: taskmgr.rc:112 taskmgr.rc:254 @@ -8816,7 +8816,7 @@ msgstr "" #: shlwapi.rc:38 user32.rc:71 regedit.rc:204 winecfg.rc:87 winefile.rc:97 msgid "Error" -msgstr "" +msgstr "දෝෂයක්" #: shlwapi.rc:43 msgid "Don't show me th&is message again" @@ -9734,7 +9734,7 @@ msgstr "" #: winemac.rc:36 msgid "Show All" -msgstr "" +msgstr "සියලුම පෙන්නන්න" #: winemac.rc:37 msgid "Quit %@" @@ -11303,26 +11303,30 @@ msgid "Usage: hostname\n" msgstr "" #: hostname.rc:31 +#, fuzzy msgid "Error: Invalid option '%c'.\n" -msgstr "" +msgstr "දෝෂයක්:" #: hostname.rc:32 +#, fuzzy msgid "Error: Could not get hostname: %u.\n" -msgstr "" +msgstr "දෝෂයක්:" #: hostname.rc:33 +#, fuzzy msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "" +msgstr "දෝෂයක්:" #: ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" msgstr "" #: ipconfig.rc:31 +#, fuzzy msgid "Error: Unknown or invalid command line parameters specified\n" -msgstr "" +msgstr "දෝෂයක්:" #: ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -11547,7 +11551,7 @@ msgstr "" #: netstat.rc:42 msgid "Errors" -msgstr "" +msgstr "දෝෂ" #: netstat.rc:43 msgid "Unknown protocols" @@ -12333,12 +12337,14 @@ msgid "Not implemented" msgstr "" #: progman.rc:71 +#, fuzzy msgid "Error reading `%s'." -msgstr "" +msgstr "දෝෂයක්" #: progman.rc:72 +#, fuzzy msgid "Error writing `%s'." -msgstr "" +msgstr "දෝෂයක්" #: progman.rc:75 msgid "" @@ -13152,24 +13158,29 @@ msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" msgstr "" #: taskkill.rc:31 +#, fuzzy msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskkill.rc:32 +#, fuzzy msgid "Error: Invalid command line parameter specified.\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskkill.rc:33 +#, fuzzy msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskkill.rc:34 +#, fuzzy msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskkill.rc:35 +#, fuzzy msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskkill.rc:36 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -13189,20 +13200,24 @@ msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" msgstr "" #: taskkill.rc:40 +#, fuzzy msgid "Error: Could not find process \"%1\".\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskkill.rc:41 +#, fuzzy msgid "Error: Unable to enumerate the process list.\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskkill.rc:42 +#, fuzzy msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskkill.rc:43 +#, fuzzy msgid "Error: Process self-termination is not permitted.\n" -msgstr "" +msgstr "දෝෂයක්:" #: taskmgr.rc:37 taskmgr.rc:108 msgid "&New Task (Run...)" @@ -14848,7 +14863,7 @@ msgstr "" #: winedbg.rc:50 winedbg.rc:38 msgid "Program Error" -msgstr "" +msgstr "මෘදුකාංගයේ දෝෂයක්" #: winedbg.rc:55 msgid "" @@ -15252,11 +15267,11 @@ msgstr "Wine උදවු" #: winhlp32.rc:86 msgid "Error while reading the help file `%s'" -msgstr "" +msgstr "උදවු ගොනුව `%s' කියවන ගමං දෝෂයක් ආවා" #: winhlp32.rc:88 msgid "Summary" -msgstr "" +msgstr "සාරාංශය" #: winhlp32.rc:87 msgid "&Index" @@ -15264,7 +15279,7 @@ msgstr "දර්ශකය (&I)" #: winhlp32.rc:91 msgid "Help files (*.hlp)" -msgstr "" +msgstr "උදවු ගොනු (*.hlp)" #: winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" @@ -15279,20 +15294,24 @@ msgid "Help topics: " msgstr "" #: wmic.rc:28 +#, fuzzy msgid "Error: Command line not supported\n" -msgstr "" +msgstr "දෝෂයක්:" #: wmic.rc:29 +#, fuzzy msgid "Error: Alias not found\n" -msgstr "" +msgstr "දෝෂයක්:" #: wmic.rc:30 +#, fuzzy msgid "Error: Invalid query\n" -msgstr "" +msgstr "දෝෂයක්:" #: wmic.rc:31 +#, fuzzy msgid "Error: Invalid syntax for PATH\n" -msgstr "" +msgstr "දෝෂයක්:" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -15368,7 +15387,7 @@ msgstr "" #: wordpad.rc:85 msgid "&Lists" -msgstr "" +msgstr "ලැයිස්තු (&L)" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" @@ -15531,7 +15550,7 @@ msgstr "U" #: wordpad.rc:147 msgid "All documents (*.*)" -msgstr "සියලුම ලියවිලි (*.txt)" +msgstr "සියලුම ලියවිලි (*.*)" #: wordpad.rc:148 msgid "Text documents (*.txt)"

1 0

Dmitry Timoshkov : windowscodecs: Fix the buffer size check in TIFF decoder's CopyPixels implementation.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: wine Branch: master Commit: 7ee553f4116b9688f574335bd71fb32f6e6c5f7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee553f4116b9688f574335b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 14 14:14:53 2019 +0800 windowscodecs: Fix the buffer size check in TIFF decoder's CopyPixels implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 2 -- dlls/windowscodecs/tiffformat.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index c15e498..7651ea1 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -598,11 +598,9 @@ static void test_tiff_24bpp(void) ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); else { -todo_wine_if(stride > 3) ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); for (i = 0; i < sizeof(data); i++) -todo_wine_if(stride > 3) ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); } } diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 93af559..3d53b24 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1105,7 +1105,7 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, if (cbStride < bytesperrow) return E_INVALIDARG; - if ((cbStride * prc->Height) > cbBufferSize) + if ((cbStride * (prc->Height-1)) + bytesperrow > cbBufferSize) return E_INVALIDARG; min_tile_x = prc->X / This->decode_info.tile_width;

1 0

Sven Baars : taskschd/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: wine Branch: master Commit: be0d31c96df5f983152132ec5f4cb1ba76dc7963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0d31c96df5f983152132ec… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 15 13:56:51 2019 +0100 taskschd/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5fc3aab..639555e 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -544,6 +544,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); ITaskFolder_Release(subfolder); } @@ -571,6 +572,7 @@ static void test_FolderCollection(void) hr = IUnknown_QueryInterface(unknown, &IID_IUnknown, (void **)&enumvar); ok(hr == S_OK, "QueryInterface error %#x\n", hr); + IUnknown_Release(unknown); hr = IEnumVARIANT_Skip(enumvar, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); @@ -605,6 +607,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); IDispatch_Release(V_DISPATCH(&var[0])); memset(var, 0, sizeof(var)); @@ -650,6 +653,7 @@ static void test_FolderCollection(void) ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); else ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); ITaskFolder_Release(subfolder); } @@ -1049,7 +1053,10 @@ static void test_settings_v1(ITaskDefinition *taskdef, struct settings *test, st if (!test->execution_time_limit[0]) ok(bstr == NULL, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); else + { ok(!lstrcmpW(bstr, test->execution_time_limit), "expected %s, got %s\n", wine_dbgstr_w(test->execution_time_limit), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } hr = ITaskSettings_get_Enabled(set, &vbool); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Gijs Vermeulen : crypt32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: wine Branch: master Commit: a15d4de557ac2ba3b2418cb39fc6080a7523e604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a15d4de557ac2ba3b2418cb3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jan 15 17:05:10 2019 +0100 crypt32/tests: Fix a memory leak (Valgrind). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 0adfeb8..d862902 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2834,6 +2834,8 @@ static void testEmptyStore(void) ok(res, "CertDeleteCertificateContextFromStore failed\n"); ok(cert3->hCertStore == cert->hCertStore, "Unexpected hCertStore\n"); + CertFreeCertificateContext(cert3); + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(store != NULL, "CertOpenStore failed\n"); @@ -2847,6 +2849,7 @@ static void testEmptyStore(void) ok(cert3->hCertStore == store, "Unexpected hCertStore\n"); CertCloseStore(store, 0); + CertFreeCertificateContext(cert3); res = CertCloseStore(cert->hCertStore, CERT_CLOSE_STORE_CHECK_FLAG); ok(!res && GetLastError() == E_UNEXPECTED, "CertCloseStore returned: %x(%x)\n", res, GetLastError());

1 0

Józef Kucia : vkd3d-shader: Fix SV_VertexID.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: vkd3d Branch: master Commit: da3e28371780ff731e6fb6cfa259e1bed91dd2b1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=da3e28371780ff731e6fb6c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 12:09:41 2019 +0100 vkd3d-shader: Fix SV_VertexID. 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> --- libs/vkd3d-shader/spirv.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9d1a0df..fa94340 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3003,31 +3003,40 @@ static uint32_t vkd3d_dxbc_compiler_emit_bool_to_int(struct vkd3d_dxbc_compiler typedef uint32_t (*vkd3d_spirv_builtin_fixup_pfn)(struct vkd3d_dxbc_compiler *compiler, uint32_t val_id); -/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */ -static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler, - uint32_t instance_index_id) +static uint32_t vkd3d_dxbc_compiler_emit_draw_parameter_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t index_id, SpvBuiltIn base) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t base_instance_var_id, base_instance_id, type_id; + uint32_t base_var_id, base_id, type_id; vkd3d_spirv_enable_capability(builder, SpvCapabilityDrawParameters); - /* The Vulkan spec states: - * - * "The variable decorated with BaseInstance must be declared as a scalar - * 32-bit integer. - */ - base_instance_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + base_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, SpvStorageClassInput, VKD3D_TYPE_INT, 1); - vkd3d_spirv_add_iface_variable(builder, base_instance_var_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, base_instance_var_id, SpvBuiltInBaseInstance); + vkd3d_spirv_add_iface_variable(builder, base_var_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, base_var_id, base); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); - base_instance_id = vkd3d_spirv_build_op_load(builder, - type_id, base_instance_var_id, SpvMemoryAccessMaskNone); + base_id = vkd3d_spirv_build_op_load(builder, + type_id, base_var_id, SpvMemoryAccessMaskNone); - return vkd3d_spirv_build_op_isub(builder, - type_id, instance_index_id, base_instance_id); + return vkd3d_spirv_build_op_isub(builder, type_id, index_id, base_id); +} + +/* Substitute "VertexIndex - BaseVertex" for SV_VertexID. */ +static uint32_t sv_vertex_id_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t vertex_index_id) +{ + return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler, + vertex_index_id, SpvBuiltInBaseVertex); +} + +/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */ +static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t instance_index_id) +{ + return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler, + instance_index_id, SpvBuiltInBaseInstance); } static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, @@ -3061,7 +3070,7 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, {VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}}, - {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}}, + {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex, sv_vertex_id_fixup}}, {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}},

1 0

Józef Kucia : tests: Add test for SV_VertexID.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: vkd3d Branch: master Commit: 5fcefdd39e4aa56fecdf5b1d3a9ada7f2da6fcd1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5fcefdd39e4aa56fecdf5b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 12:09:42 2019 +0100 tests: Add test for SV_VertexID. 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> --- tests/d3d12.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a2a40d6..32220a9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19295,6 +19295,231 @@ static void test_instance_id(void) destroy_test_context(&context); } +static void test_vertex_id(void) +{ + static const DWORD vs_code[] = + { +#if 0 + uint4 main(uint id : ID, uint instance_id : SV_InstanceID, uint vertex_id : SV_VertexID) : OUTPUT + { + return uint4(id, instance_id, vertex_id, 0); + } +#endif + 0x43425844, 0x5625197b, 0x588ccf8f, 0x48694905, 0x961d19ca, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x000000a4, 0x000000d4, 0x4e475349, 0x00000070, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x00000053, 0x00000000, 0x00000008, + 0x00000001, 0x00000001, 0x00000101, 0x00000061, 0x00000000, 0x00000006, 0x00000001, 0x00000002, + 0x00000101, 0x53004449, 0x6e495f56, 0x6e617473, 0x44496563, 0x5f565300, 0x74726556, 0x44497865, + 0xababab00, 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x0000000f, 0x5054554f, 0xab005455, 0x52444853, 0x00000094, 0x00010040, + 0x00000025, 0x0300005f, 0x00101012, 0x00000000, 0x04000060, 0x00101012, 0x00000001, 0x00000008, + 0x04000060, 0x00101012, 0x00000002, 0x00000006, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010100a, + 0x00000001, 0x05000036, 0x00102042, 0x00000000, 0x0010100a, 0x00000002, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"ID", 0, DXGI_FORMAT_R32_UINT, 0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "OUTPUT", 0, 0, 4, 0}, + }; + static const unsigned int strides[] = {16}; + static const unsigned int vertices[] = + { + 0, + 1, + 2, + + 3, + 4, + 5, + + 6, + 7, + 8, + + 5, + 6, + 7, + }; + static const unsigned int indices[] = + { + 6, 7, 8, + + 0, 1, 2, + }; + struct uvec4 expected_values[] = + { + {0, 0, 0}, + {1, 0, 1}, + {2, 0, 2}, + {0, 1, 0}, + {1, 1, 1}, + {2, 1, 2}, + + {3, 0, 0}, + {4, 0, 1}, + {5, 0, 2}, + + {6, 0, 6}, + {7, 0, 7}, + {8, 0, 8}, + {6, 1, 6}, + {7, 1, 7}, + {8, 1, 8}, + + {5, 0, 0}, + {6, 0, 1}, + {7, 0, 2}, + }; + + BOOL found_values[ARRAY_SIZE(expected_values)] = {0}; + BOOL used_values[ARRAY_SIZE(expected_values)] = {0}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12Resource *counter_buffer, *so_buffer; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + ID3D12Resource *upload_buffer; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + D3D12_INDEX_BUFFER_VIEW ibv; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb, *ib; + ID3D12Device *device; + unsigned int count; + unsigned int i, j; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, &vs, NULL, &input_layout); + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + if (hr == E_NOTIMPL) + { + skip("Stream output is not supported.\n"); + destroy_test_context(&context); + return; + } + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + ib = create_upload_buffer(context.device, sizeof(indices), indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = sizeof(indices); + ibv.Format = DXGI_FORMAT_R32_UINT; + + count = 0; + upload_buffer = create_upload_buffer(device, sizeof(count), &count); + + counter_buffer = create_default_buffer(device, 32, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + so_buffer = create_default_buffer(device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = ID3D12Resource_GetGPUVirtualAddress(counter_buffer); + + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, counter_buffer, 0, + upload_buffer, 0, sizeof(count)); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT); + + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 2, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 3, 16); + + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 2, 0, 0, 0); + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 1, 3, 9, 7); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + count = get_readback_uint(&rb, 0, 0, 0); + ok(count == ARRAY_SIZE(expected_values) * sizeof(struct vec4), "Got counter value %u, expected %uu.\n", + count, (unsigned int)(ARRAY_SIZE(expected_values) * sizeof(struct vec4))); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + count /= sizeof(struct vec4); + + count = min(count, ARRAY_SIZE(used_values)); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + for (j = 0; j < count; ++j) + { + if (!used_values[j] && compare_uvec4(get_readback_uvec4(&rb, j, 0), &expected_values[i])) + { + found_values[i] = TRUE; + used_values[j] = TRUE; + break; + } + } + } + + for (i = 0; i < count; ++i) + { + const struct uvec4 *v = get_readback_uvec4(&rb, i, 0); + ok(used_values[i], "Found unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", v->x, v->y, v->z, v->w); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + ok(found_values[i], "Failed to find value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + expected_values[i].x, expected_values[i].y, expected_values[i].z, expected_values[i].w); + } + + ID3D12Resource_Release(counter_buffer); + ID3D12Resource_Release(ib); + ID3D12Resource_Release(so_buffer); + ID3D12Resource_Release(upload_buffer); + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + static void test_copy_texture_region(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; @@ -22661,6 +22886,7 @@ START_TEST(d3d12) run_test(test_execute_indirect); run_test(test_dispatch_zero_thread_groups); run_test(test_instance_id); + run_test(test_vertex_id); run_test(test_copy_texture_region); run_test(test_separate_bindings); run_test(test_face_culling);

1 0