November 2017 - Wine-Commits

Rafał Harabień : riched20: Protect read-only Richedit against pasting and cutting data.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 55412553e8535386e2bcbfa538a9e65dbe9536f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55412553e8535386e2bcbfa53… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Mon Nov 6 23:12:23 2017 +0100 riched20: Protect read-only Richedit against pasting and cutting data. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 62 ++++++++++++++++++++++++-------------------- dlls/riched20/tests/editor.c | 15 +++++++++++ 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a7b1bc7..88e3d8e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2294,6 +2294,14 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO struct paste_format *format; IDataObject *data; + /* Protect read-only edit control from modification */ + if (editor->styleFlags & ES_READONLY) + { + if (!check_only) + MessageBeep(MB_ICONERROR); + return FALSE; + } + init_paste_formats(); if (ps && ps->dwAspect != DVASPECT_CONTENT) @@ -2351,6 +2359,30 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) return SUCCEEDED(hr); } +static BOOL copy_or_cut(ME_TextEditor *editor, BOOL cut) +{ + BOOL result; + int offs, num_chars; + int start_cursor = ME_GetSelectionOfs(editor, &offs, &num_chars); + ME_Cursor *sel_start = &editor->pCursors[start_cursor]; + + if (cut && (editor->styleFlags & ES_READONLY)) + { + MessageBeep(MB_ICONERROR); + return FALSE; + } + + num_chars -= offs; + result = ME_Copy(editor, sel_start, num_chars); + if (result && cut) + { + ME_InternalDeleteText(editor, sel_start, num_chars, FALSE); + ME_CommitUndo(editor); + ME_UpdateRepaint(editor, TRUE); + } + return result; +} + /* helper to send a msg filter notification */ static BOOL ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) @@ -2645,22 +2677,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'C': case 'X': if (ctrl_is_down) - { - BOOL result; - int nOfs, nChars; - int nStartCur = ME_GetSelectionOfs(editor, &nOfs, &nChars); - ME_Cursor *selStart = &editor->pCursors[nStartCur]; - - nChars -= nOfs; - result = ME_Copy(editor, selStart, nChars); - if (result && nKey == 'X') - { - ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor, TRUE); - } - return result; - } + return copy_or_cut(editor, nKey == 'X'); break; case 'Z': if (ctrl_is_down) @@ -4068,19 +4085,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_CUT: case WM_COPY: - { - int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); - int nChars = nTo - nFrom; - ME_Cursor *selStart = &editor->pCursors[nStartCur]; - - if (ME_Copy(editor, selStart, nChars) && msg == WM_CUT) - { - ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor, TRUE); - } + copy_or_cut(editor, msg == WM_CUT); return 0; - } case WM_GETTEXTLENGTH: { GETTEXTLENGTHEX how; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 20189c6..a19ec85 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5498,6 +5498,21 @@ static void test_WM_PASTE(void) "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); + /* Paste into read-only control */ + result = SendMessageA(hwndRichEdit, EM_SETREADONLY, TRUE, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer,"cut\r\n"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + + /* Cut from read-only control */ + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, WM_CUT, 0, 0); + result = strcmp(buffer,"cut\r\n"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + DestroyWindow(hwndRichEdit); }

1 0

Rosanne DiMesio : Show/ hide What doesnt work and Workarounds textareas based on user input
by Jeremy Newman Nov. 7, 2017

Nov. 7, 2017

Module: appdb Branch: master Commit: 88f3a7acddf72c1660af7b873ed5b219ea0711ae URL: http://source.winehq.org/git/appdb.git/?a=commit;h=88f3a7acddf72c1660af7b87… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Nov 6 11:13:13 2017 -0600 Show/hide What doesnt work and Workarounds textareas based on user input Hides these textareas by default and only shows them if the user responds "Yes" to the accompanying yes/no question. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/include/testData.php b/include/testData.php index ad4dea9..1083cfb 100644 --- a/include/testData.php +++ b/include/testData.php @@ -858,44 +858,51 @@ class testData{ // What Does not work echo '<tr valign=top><td><b>What does not work</b></td>',"\n"; echo '<td>'; - echo 'Were there any problems that do not exist in Windows? <i>If yes, describe the problems in the box below.</i><br>'; + echo 'Were there any problems that do not exist in Windows? <br>'; if(isset($this->sHasProblems)) { if($this->sHasProblems == "Yes") { - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="Yes" checked>Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="No">No</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=true name="sHasProblems" value="Yes" checked>Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=false name="sHasProblems" value="No">No</label>'; }else{ - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="Yes">Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="No" checked>No</label>'; + echo '<label class="radio-inline"><input type="radio"data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=true name="sHasProblems" value="Yes">Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=false name="sHasProblems" value="No" checked>No</label>'; } } else { - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="Yes">Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sHasProblems" value="No">No</label><br>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=true name="sHasProblems" value="Yes">Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#whatdoesnt" data-showdiv=false name="sHasProblems" value="No">No</label>'; }; + echo '<div id="whatdoesnt" style="display:none">'; + echo '<i>Describe the problem(s) in the box below.</i><br>'; echo '<p><textarea cols="80" rows="20" id="Test2" name="shWhatDoesnt" class="wysiwyg">'; echo $this->shWhatDoesnt.'</textarea></p></td></tr>',"\n"; + echo '</div>'; // Workarounds echo '<tr valign=top><td><b>Workarounds</b></td>',"\n"; echo '<td>'; - echo 'Were any workarounds used for problems that do not exist in Windows? <i>If yes, describe the workaround(s) in the box below.</i><br>'; + echo 'Were any workarounds used for problems that do not exist in Windows? <br>'; if(isset($this->sUsedWorkaround)) { if($this->sUsedWorkaround == "Yes") { - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="Yes" checked>Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="No">No</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=true name="sUsedWorkaround" value="Yes" checked>Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=false name="sUsedWorkaround" value="No">No</label>'; }else{ - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="Yes">Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="No" checked>No</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=true name="sUsedWorkaround" value="Yes">Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=false name="sUsedWorkaround" value="No" checked>No</label>'; } } else { - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="Yes">Yes</label>'; - echo '<label class="radio-inline"><input type="radio" name="sUsedWorkaround" value="No">No</label><br>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=true name="sUsedWorkaround" value="Yes">Yes</label>'; + echo '<label class="radio-inline"><input type="radio" data-toggle="radioshow" data-target="#workarounds" data-showdiv=false name="sUsedWorkaround" value="No">No</label><br>'; }; + + echo '<div id="workarounds" style="display:none">'; + echo '<i>Describe the workaround(s) in the box below.</i><br>'; echo '<textarea cols="80" rows="20" id="Test4" name="shWorkarounds" class="wysiwyg">'; echo $this->shWorkarounds.'</textarea></p></td></tr>',"\n"; + echo '</div>'; // What was not tested echo '<tr valign=top><td><b>What was not tested</b></td>',"\n";

1 0

Rosanne DiMesio : Show/hide div based on radio button clicks
by Jeremy Newman Nov. 7, 2017

Nov. 7, 2017

Module: appdb Branch: master Commit: 622dd64c06406c30f40148b33227cc4da1aa78db URL: http://source.winehq.org/git/appdb.git/?a=commit;h=622dd64c06406c30f40148b3… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Nov 6 11:11:44 2017 -0600 Show/hide div based on radio button clicks Adds javascript function that will be used to show or hide the test report form textareas that have radio button yes/no questions (currently the What does not work and Workarounds fields). Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- js/utils.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/js/utils.js b/js/utils.js index 0fdcb92..b4adc9a 100644 --- a/js/utils.js +++ b/js/utils.js @@ -222,9 +222,19 @@ $(document).ready(function() $(this).collapse('show'); } }); - - // HTML editor (redactor loader) + + /* Show/hide div based on radio button clicks. */ + $('input[type=radio][data-toggle=radioshow]').click(function(){ + if($(this).data("showdiv") == true) { + $($(this).data("target")).show(); + } + else if($(this).data("showdiv") == false) { + $($(this).data("target")).hide(); + } + }); + $('[data-toggle="radioshow"]:checked').trigger('click'); + // HTML editor (redactor loader) });

1 0

Marcus Meissner : ieframe/tests: Avoid crash on missing IID_IWebBrowser2 interface.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: afbd598ac1e5482085d08e1ab90f70b93a7969ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbd598ac1e5482085d08e1ab… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Nov 3 18:02:50 2017 +0100 ieframe/tests: Avoid crash on missing IID_IWebBrowser2 interface. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/ie.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index ac055e2..cb901d7 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -260,10 +260,14 @@ static void test_InternetExplorer(void) if(hres != S_OK) return; - advise_cp(unk, TRUE); - hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); + if (hres != S_OK) { + IUnknown_Release(unk); + return; + } + + advise_cp(unk, TRUE); test_visible(wb); test_html_window(wb);

1 0

Fabian Maurer : comctl32/taskdialog: Added support for nDefaultButton.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 32c42cc109e0cf8826a2e0b791ee2a2d32f932e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c42cc109e0cf8826a2e0b79… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 6 14:40:38 2017 +0300 comctl32/taskdialog: Added support for nDefaultButton. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 40 +++++++----- dlls/comctl32/tests/taskdialog.c | 135 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 153 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32c42cc109e0cf8826a2e…

1 0

Alex Henrie : kernel32/tests: Detect and handle a redirected stdin.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: f962bb0039c87c084214ca0bd4f40693db376195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f962bb0039c87c084214ca0bd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 3 11:43:20 2017 +0100 kernel32/tests: Detect and handle a redirected stdin. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a14bc45..926c052 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2582,6 +2582,11 @@ static void test_ReadConsole(void) SetLastError(0xdeadbeef); ret = GetFileSize(std_input, NULL); + if (GetLastError() == 0xdeadbeef) + { + skip("stdin is redirected\n"); + return; + } ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */

1 0

Gerald Pfeifer : advapi32/tests: Fix two clang warnings in test_LookupAccount SID_NAME_USE being out of range.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 50fe77a35821b852f0b0a51aee8838f33541d5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fe77a35821b852f0b0a51ae… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 5 10:46:22 2017 +0100 advapi32/tests: Fix two clang warnings in test_LookupAccount SID_NAME_USE being out of range. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d41e42e..73fd752 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2534,7 +2534,7 @@ static void test_LookupAccountName(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(sid_size != 0, "Expected non-zero sid size\n"); ok(domain_size != 0, "Expected non-zero domain size\n"); - ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + ok(sid_use == (SID_NAME_USE)0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); sid_save = sid_size; domain_save = domain_size; @@ -2621,7 +2621,7 @@ static void test_LookupAccountName(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(sid_size != 0, "Expected non-zero sid size\n"); ok(domain_size != 0, "Expected non-zero domain size\n"); - ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + ok(sid_use == (SID_NAME_USE)0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); psid = HeapAlloc(GetProcessHeap(), 0, sid_size); domain = HeapAlloc(GetProcessHeap(), 0, domain_size);

1 0

Andrey Gusev : mf: Add MFGetSupportedMimeTypes stub.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 1d7e48a522d668789574f1da5a1859acd9fe2f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7e48a522d668789574f1da5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 6 11:47:11 2017 +0200 mf: Add MFGetSupportedMimeTypes stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 16 ++++++++++++++++ dlls/mf/mf.spec | 2 +- include/mfidl.idl | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 1b223ad..2ad2e5d 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -15,12 +15,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "mfidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -35,3 +41,13 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/*********************************************************************** + * MFGetSupportedMimeTypes (mf.@) + */ +HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array) +{ + FIXME("(%p) stub\n", array); + + return E_NOTIMPL; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 3b02bd2..54fa1f3 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -73,7 +73,7 @@ @ stub MFEnumDeviceSources @ stub MFGetMultipleServiceProviders @ stub MFGetService -@ stub MFGetSupportedMimeTypes +@ stdcall MFGetSupportedMimeTypes(ptr) @ stub MFGetSupportedSchemes @ stub MFGetTopoNodeCurrentType @ stub MFReadSequencerSegmentOffset diff --git a/include/mfidl.idl b/include/mfidl.idl index 80fa5ec..2792d38 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -255,3 +255,4 @@ cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);" cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") +cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);")

1 0

Józef Kucia : wined3d: Get rid of compute_shader_init ().
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: a1e158971c16da318bfd890e2b9e3979a1cf1d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e158971c16da318bfd890e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:26 2017 +0100 wined3d: Get rid of compute_shader_init(). 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/shader.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 94ad145..0bad4fa 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4066,12 +4066,6 @@ void pixelshader_update_resource_types(struct wined3d_shader *shader, WORD tex_t } } -static HRESULT compute_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) -{ - return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops); -} - HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader) { @@ -4084,7 +4078,7 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = compute_shader_init(object, device, desc, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops))) { WARN("Failed to initialize compute shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Józef Kucia : wined3d: Use wined3d_insert_bits().
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 708c337f28430fe065886b9eebf8b9d3323398ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=708c337f28430fe065886b9ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:24 2017 +0100 wined3d: Use wined3d_insert_bits(). 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/shader.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 215f83b..94ad145 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -692,14 +692,6 @@ static void shader_set_limits(struct wined3d_shader *shader) } } -static inline void set_bitmap_bit(DWORD *bitmap, DWORD bit) -{ - DWORD idx, shift; - idx = bit >> 5; - shift = bit & 0x1f; - bitmap[idx] |= (1u << shift); -} - static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct wined3d_shader_reg_maps *reg_maps, const struct wined3d_shader_register *reg, enum wined3d_shader_type shader_type, unsigned int constf_size) { @@ -767,7 +759,7 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w } else { - set_bitmap_bit(reg_maps->constf, reg->idx[0].offset); + wined3d_insert_bits(reg_maps->constf, reg->idx[0].offset, 1, 0x1); } } break;

1 0

Józef Kucia : wined3d: Get rid of hull_shader_init().
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: a063ca2e5b88fdde27a23ee5c1fce01fd6f03b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a063ca2e5b88fdde27a23ee5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:28 2017 +0100 wined3d: Get rid of hull_shader_init(). 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/shader.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6ba0fc4..3707d15 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3674,12 +3674,6 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; } -static HRESULT hull_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) -{ - return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_HULL, parent, parent_ops); -} - static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -4148,7 +4142,7 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = hull_shader_init(object, device, desc, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_HULL, parent, parent_ops))) { WARN("Failed to initialize hull shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Józef Kucia : wined3d: Get rid of domain_shader_init( ).
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 86933f9d31b1a1e187dfb1c554124d6d49066660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86933f9d31b1a1e187dfb1c55… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:27 2017 +0100 wined3d: Get rid of domain_shader_init(). 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/shader.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0bad4fa..6ba0fc4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3674,12 +3674,6 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; } -static HRESULT domain_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) -{ - return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops); -} - static HRESULT hull_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -4103,7 +4097,7 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = domain_shader_init(object, device, desc, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops))) { WARN("Failed to initialize domain shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawEllipse.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 3186df2b024b02eec4715d3f932903728af47156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3186df2b024b02eec4715d3f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 6 13:32:09 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawEllipse. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c40097e..989ecd0 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -444,6 +444,16 @@ typedef struct EmfPlusDrawArc } RectData; } EmfPlusDrawArc; +typedef struct EmfPlusDrawEllipse +{ + EmfPlusRecordHeader Header; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawEllipse; + typedef struct EmfPlusDrawPie { EmfPlusRecordHeader Header; @@ -3091,6 +3101,26 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, draw->RectData.rectF.Height, draw->StartAngle, draw->SweepAngle); } + case EmfPlusRecordTypeDrawEllipse: + { + EmfPlusDrawEllipse *draw = (EmfPlusDrawEllipse *)header; + BYTE pen = flags & 0xff; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize != (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + return GdipDrawEllipseI(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rect.X, draw->RectData.rect.Y, draw->RectData.rect.Width, + draw->RectData.rect.Height); + else + return GdipDrawEllipse(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, + draw->RectData.rectF.Height); + } case EmfPlusRecordTypeDrawPie: { EmfPlusDrawPie *draw = (EmfPlusDrawPie *)header;

1 0

Józef Kucia : wined3d: Use wined3d_extract_bits().
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: e15b5c06d38c22277b543c7f23003554e5486108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15b5c06d38c22277b543c7f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:25 2017 +0100 wined3d: Use wined3d_extract_bits(). 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/arb_program_shader.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 80c7354..f4e23d0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -877,7 +877,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader /* After subtracting privately used constants from the hardware limit(they are loaded as * local constants), make sure the shader doesn't violate the env constant limit */ - if(pshader) + if (pshader) { max_constantsF = min(max_constantsF, gl_info->limits.arb_ps_float_constants); } @@ -905,10 +905,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader { for (i = 0; i < max_constantsF; ++i) { - DWORD idx, mask; - idx = i >> 5; - mask = 1u << (i & 0x1fu); - if (!shader_constant_is_local(shader, i) && (reg_maps->constf[idx] & mask)) + if (!shader_constant_is_local(shader, i) && wined3d_extract_bits(reg_maps->constf, i, 1)) { shader_addline(buffer, "PARAM C%d = program.env[%d];\n",i, i); }

1 0

Józef Kucia : d3d11/tests: Add test for sample_c_lz instruction.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: e23ffa5548ae6806fa21fe93fb3f7684ec971b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23ffa5548ae6806fa21fe93f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:23 2017 +0100 d3d11/tests: Add test for sample_c_lz instruction. 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 | 312 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e23ffa5548ae6806fa21f…

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawArc.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 2f2cbd415079a44afcac3c7904c11462f2f20190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2cbd415079a44afcac3c790… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 6 13:32:08 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawArc. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f923a9b..c40097e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -432,6 +432,18 @@ typedef struct EmfPlusDrawPath DWORD PenId; } EmfPlusDrawPath; +typedef struct EmfPlusDrawArc +{ + EmfPlusRecordHeader Header; + float StartAngle; + float SweepAngle; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawArc; + typedef struct EmfPlusDrawPie { EmfPlusRecordHeader Header; @@ -3058,6 +3070,27 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return GdipDrawPath(real_metafile->playback_graphics, real_metafile->objtable[draw->PenId].u.pen, real_metafile->objtable[path].u.path); } + case EmfPlusRecordTypeDrawArc: + { + EmfPlusDrawArc *draw = (EmfPlusDrawArc *)header; + BYTE pen = flags & 0xff; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize != FIELD_OFFSET(EmfPlusDrawArc, RectData) - sizeof(EmfPlusRecordHeader) + + (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + return GdipDrawArcI(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rect.X, draw->RectData.rect.Y, draw->RectData.rect.Width, + draw->RectData.rect.Height, draw->StartAngle, draw->SweepAngle); + else + return GdipDrawArc(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, + draw->RectData.rectF.Height, draw->StartAngle, draw->SweepAngle); + } case EmfPlusRecordTypeDrawPie: { EmfPlusDrawPie *draw = (EmfPlusDrawPie *)header;

1 0

Józef Kucia : wined3d: Use textureGrad*() to implement sample_c_lz for array and cube textures.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: ce8610cea58ed1ba9d8f17857e507d9d6c30132d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8610cea58ed1ba9d8f17857… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:22 2017 +0100 wined3d: Use textureGrad*() to implement sample_c_lz for array and cube textures. Based on a patch by Michael Müller. 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 | 50 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f75a7a..91a6c6e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6014,9 +6014,41 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } +/* GLSL doesn't provide a function to sample from level zero with depth + * comparison for array textures and cube textures. We use textureGrad*() + * to implement sample_c_lz. + */ +static void shader_glsl_gen_sample_c_lz(const struct wined3d_shader_instruction *ins, + unsigned int sampler_bind_idx, const struct glsl_sample_function *sample_function, + unsigned int coord_size, const char *coord_param, const char *ref_param) +{ + const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; + unsigned int deriv_size = wined3d_popcount(sample_function->deriv_mask); + const struct wined3d_shader_texel_offset *offset = &ins->texel_offset; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + char dst_swizzle[6]; + + WARN("Emitting textureGrad() for sample_c_lz.\n"); + + shader_glsl_swizzle_to_str(WINED3DSP_NOSWIZZLE, FALSE, ins->dst[0].write_mask, dst_swizzle); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], sample_function->data_type); + shader_addline(buffer, "vec4(textureGrad%s(%s_sampler%u, vec%u(%s, %s), vec%u(0.0), vec%u(0.0)", + sample_function->offset_size ? "Offset" : "", + shader_glsl_get_prefix(version->type), sampler_bind_idx, + coord_size, coord_param, ref_param, deriv_size, deriv_size); + if (sample_function->offset_size) + { + int offset_immdata[4] = {offset->u, offset->v, offset->w}; + shader_addline(buffer, ", "); + shader_glsl_append_imm_ivec(buffer, offset_immdata, sample_function->offset_size); + } + shader_addline(buffer, "))%s);\n", dst_swizzle); +} + static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) { unsigned int resource_idx, sampler_idx, sampler_bind_idx; + const struct wined3d_shader_resource_info *resource_info; struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; const char *lod_param = NULL; @@ -6032,6 +6064,8 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; + if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[1].reg))) + return; resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset; @@ -6040,9 +6074,19 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask >> 1, &coord_param); shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); - shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, WINED3DSP_NOSWIZZLE, - NULL, NULL, lod_param, &ins->texel_offset, "vec%u(%s, %s)", - coord_size, coord_param.param_str, compare_param.param_str); + if (ins->handler_idx == WINED3DSIH_SAMPLE_C_LZ + && (resource_info->type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY + || resource_info->type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE)) + { + shader_glsl_gen_sample_c_lz(ins, sampler_bind_idx, &sample_function, + coord_size, coord_param.param_str, compare_param.param_str); + } + else + { + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, lod_param, &ins->texel_offset, "vec%u(%s, %s)", + coord_size, coord_param.param_str, compare_param.param_str); + } shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Józef Kucia : wined3d: Create textures views for depth views.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 14da948b74a4844f4a363d847872bcf60b7ebb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14da948b74a4844f4a363d847… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:21 2017 +0100 wined3d: Create textures views for depth views. In Direct3D a different format is used for sampling depth textures, but this is not the case in OpenGL. We still need to create a texture view when a texture type is different than a view type, or when a shader resource view is being created for a subset of sub-resources. 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/utils.c | 25 ++++++++++++++++++++----- dlls/wined3d/view.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2a12a91..0e00203 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -285,16 +285,17 @@ struct wined3d_typeless_format_depth_stencil_info enum wined3d_format_id depth_stencil_id; enum wined3d_format_id depth_view_id; enum wined3d_format_id stencil_view_id; + BOOL separate_depth_view_format; }; static const struct wined3d_typeless_format_depth_stencil_info typeless_depth_stencil_formats[] = { {WINED3DFMT_R32G8X24_TYPELESS, WINED3DFMT_D32_FLOAT_S8X24_UINT, - WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT}, + WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT, TRUE}, {WINED3DFMT_R24G8_TYPELESS, WINED3DFMT_D24_UNORM_S8_UINT, - WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT}, - {WINED3DFMT_R32_TYPELESS, WINED3DFMT_D32_FLOAT}, - {WINED3DFMT_R16_TYPELESS, WINED3DFMT_D16_UNORM}, + WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT, TRUE}, + {WINED3DFMT_R32_TYPELESS, WINED3DFMT_D32_FLOAT, WINED3DFMT_R32_FLOAT}, + {WINED3DFMT_R16_TYPELESS, WINED3DFMT_D16_UNORM, WINED3DFMT_R16_UNORM}, }; struct wined3d_format_ddi_info @@ -3536,7 +3537,8 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); } - if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) + if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) + && typeless_depth_stencil_formats[i].separate_depth_view_format) { if (!(depth_view_format = get_format_internal(gl_info, format_id))) return FALSE; @@ -3753,6 +3755,19 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl return format; } +BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, + enum wined3d_format_id view_format_id) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(typeless_depth_stencil_formats); ++i) + { + if (typeless_depth_stencil_formats[i].typeless_id == resource_format_id) + return typeless_depth_stencil_formats[i].depth_view_id == view_format_id; + } + return FALSE; +} + void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigned int alignment, unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 2ffb718..62f087b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -712,6 +712,10 @@ static void wined3d_shader_resource_view_cs_init(void *object) { create_texture_view(&view->gl_view, view_target, desc, texture, view_format); } + else if (wined3d_format_is_depth_view(resource->format->id, view_format->id)) + { + create_texture_view(&view->gl_view, view_target, desc, texture, resource->format); + } else { FIXME("Shader resource view not supported, resource format %s, view format %s.\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6dce970..31d83c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4244,6 +4244,8 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) DECLSPEC_HIDDEN; void wined3d_format_get_float_color_key(const struct wined3d_format *format, const struct wined3d_color_key *key, struct wined3d_color *float_colors) DECLSPEC_HIDDEN; +BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, + enum wined3d_format_id view_format_id) DECLSPEC_HIDDEN; const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN;

1 0

Józef Kucia : d3d10core/tests: Add test for SV_InstanceID.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: fcd549345d96109179b125d31baf9e9073ecf643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd549345d96109179b125d31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:20 2017 +0100 d3d10core/tests: Add test for SV_InstanceID. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 236 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 227 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcd549345d96109179b12…

1 0

Dmitry Timoshkov : ws2_32/tests: Add some tests for sockets bound to a completion port.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: b32e8c678b09ec719d98a2f5a84f8162344f02ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32e8c678b09ec719d98a2f5a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 6 13:13:43 2017 +0800 ws2_32/tests: Add some tests for sockets bound to a completion port. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 702 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 700 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b32e8c678b09ec719d98a…

1 0

Zebediah Figura : user32/tests: Simplify test_SendMessage_other_thread().
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: d385de71e346f1caa19c28af7ef4b20f4a822592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d385de71e346f1caa19c28af7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 01:01:20 2017 -0500 user32/tests: Simplify test_SendMessage_other_thread(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 10f4fbd..64c7967 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16365,9 +16365,6 @@ static const struct message send_message_2[] = { }; static const struct message send_message_3[] = { { WM_USER+3, sent|wparam|lparam, 0, 0 }, - { 0 } -}; -static const struct message send_message_4[] = { { WM_USER+1, sent|wparam|lparam, 0, 0 }, { 0 } }; @@ -16474,15 +16471,10 @@ static void test_SendMessage_other_thread(int thread_n) ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); - ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); - ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); - - trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_4, "SendMessage from other thread 4", FALSE); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input);

1 0

Marcus Meissner : ole32: Clipboard format in the datacache is with trailing \0.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: d382b8e91a4516811b9c6b0d85b3d132bec6ea2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d382b8e91a4516811b9c6b0d8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 5 23:07:05 2017 +0100 ole32: Clipboard format in the datacache is with trailing \0. GetClipboardFormatName returns length without terminating 0, but we need to store it with \0. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2907426..48453b4 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -470,6 +470,10 @@ static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) hr = IStream_Read(stream, &length, sizeof(length), &read); if (hr != S_OK || read != sizeof(length)) return DV_E_CLIPFORMAT; + if (!length) { + /* No clipboard format present */ + return S_OK; + } if (length == -1) { DWORD cf; @@ -499,11 +503,16 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) { DWORD length; HRESULT hr; + char format_name[256]; if (clipformat < 0xc000) length = -1; else - length = GetClipboardFormatNameA(clipformat, NULL, 0); + { + length = GetClipboardFormatNameA(clipformat, format_name, sizeof(format_name)); + /* If there is a clipboard format name, we need to include its terminating \0 */ + if (length) length++; + } hr = IStream_Write(stream, &length, sizeof(length), NULL); if (FAILED(hr)) return hr; @@ -514,12 +523,7 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) } else { - char *format_name = HeapAlloc(GetProcessHeap(), 0, length); - if (!format_name) - return E_OUTOFMEMORY; - GetClipboardFormatNameA(clipformat, format_name, length); hr = IStream_Write(stream, format_name, length, NULL); - HeapFree(GetProcessHeap(), 0, format_name); } return hr; }

1 0

Gerald Pfeifer : fusion: Remove unused to_multibyte function.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 9b187da8b88e4cb930c08e1fb0b5741c9e8a171e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b187da8b88e4cb930c08e1fb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 5 10:48:22 2017 +0100 fusion: Remove unused to_multibyte function. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/tests/asmname.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 01ebd0a..b93f289 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -339,11 +339,6 @@ static inline void to_widechar(LPWSTR dest, LPCSTR src) MultiByteToWideChar(CP_ACP, 0, src, -1, dest, MAX_PATH); } -static inline void to_multibyte(LPSTR dest, LPWSTR src) -{ - WideCharToMultiByte(CP_ACP, 0, src, -1, dest, MAX_PATH, NULL, NULL); -} - static void test_assembly_name_props_line(IAssemblyName *name, const ASMPROP_RES *vals, int line) {

1 0

Marcus Meissner : user32/tests: Check GetClipboardFormatName length.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 77f4c20af31edb1e1786417912d915e12aebbe3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f4c20af31edb1e178641791… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 5 22:58:51 2017 +0100 user32/tests: Check GetClipboardFormatName length. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 8391ea0..aa3bd04 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -385,6 +385,9 @@ static void test_RegisterClipboardFormatA(void) ok(len == lstrlenA("my_cool_clipboard_format"), "wrong format name length %d\n", len); ok(!lstrcmpA(buf, "my_cool_clipboard_format"), "wrong format name \"%s\"\n", buf); + len = GetClipboardFormatNameA(format_id, NULL, 0); + ok(len == 0, "wrong format name length %d\n", len); + lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); len = GetAtomNameA((ATOM)format_id, buf, 256);

1 0

Nikolay Sivov : xmllite/tests: Fix clang warning.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: b077271cfb1741c77dd753920132f4e79cc27090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b077271cfb1741c77dd753920… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 5 11:39:53 2017 +0300 xmllite/tests: Fix clang warning. Reported by Gerald Pfeifer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0f03c3b..0033776 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -273,7 +273,7 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, state = -1; /* invalid state value */ IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); - if (exp_broken == -1) + if (exp_broken == expected) broken_state = FALSE; else broken_state = broken(exp_broken == state); @@ -282,7 +282,7 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, state_to_str(expected), state_to_str(state)); } -#define TEST_READER_STATE(reader, state) test_read_state(reader, state, -1, __LINE__) +#define TEST_READER_STATE(reader, state) test_read_state(reader, state, state, __LINE__) #define TEST_READER_STATE2(reader, state, brk) test_read_state(reader, state, brk, __LINE__) #define reader_value(a,b) _reader_value(__LINE__,a,b)

1 0