September 2017 - Wine-Commits

Nikolay Sivov : dwrite: Support DWRITE_TRIMMING_GRANULARITY_WORD mode.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: 096df5f5baa11d8417309c5dc4a776b4c8bb89db URL: http://source.winehq.org/git/wine.git/?a=commit;h=096df5f5baa11d8417309c5dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 12:37:14 2017 +0300 dwrite: Support DWRITE_TRIMMING_GRANULARITY_WORD mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9109107..4b67ce0 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1879,7 +1879,15 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust while (last_cluster > first_cluster) { if (trimmed_width + sign_metrics.width <= layout->metrics.layoutWidth) break; - trimmed_width -= layout->clustermetrics[last_cluster--].width; + if (layout->format.trimming.granularity == DWRITE_TRIMMING_GRANULARITY_CHARACTER) + trimmed_width -= layout->clustermetrics[last_cluster--].width; + else { + while (last_cluster > first_cluster) { + trimmed_width -= layout->clustermetrics[last_cluster].width; + if (layout->clustermetrics[last_cluster--].canWrapLineAfter) + break; + } + } } append_trimming_run = TRUE; }

1 0

Matteo Bruni : wined3d: Get rid of most of the redundant query flushes.
by Alexandre Julliard Sept. 11, 2017

Sept. 11, 2017

Module: wine Branch: master Commit: cc8e87372036504f1b25036125072d1d5a84e18c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8e87372036504f1b2503612… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 8 18:44:08 2017 +0200 wined3d: Get rid of most of the redundant query flushes. This way we avoid queueing up CS packets on each wined3d_query_get_data() call, which has been seen in some degenerate cases to starve other client threads that are trying to submit actual work into the CS (sort-of a livelock). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 ++ dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6ea2fd2..0ff0c61 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -877,6 +877,7 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) op->opcode = WINED3D_CS_OP_FLUSH; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->queries_flushed = TRUE; } static void wined3d_cs_exec_set_predication(struct wined3d_cs *cs, const void *data) @@ -1863,6 +1864,7 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu op->flags = flags; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->queries_flushed = FALSE; } static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 88f64bd..1bdaaf0 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -389,7 +389,7 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, } else if (query->counter_main != query->counter_retrieved) { - if (flags & WINED3DGETDATA_FLUSH) + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) wined3d_cs_emit_flush(query->device->cs); return S_FALSE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70120e8..04f2955 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3427,6 +3427,7 @@ struct wined3d_cs size_t data_size, start, end; void *data; struct list query_poll_list; + BOOL queries_flushed; HANDLE event; BOOL waiting_for_event;

1 0

Rosanne DiMesio : Adjust test results table ratings colors
by Jeremy Newman Sept. 11, 2017

Sept. 11, 2017

Module: appdb Branch: master Commit: 2c2c8996408ab41ef29fddc342dc905cab3f8a56 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2c2c8996408ab41ef29fddc3… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 10:42:03 2017 -0500 Adjust test results table ratings colors Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- css/styles.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css/styles.css b/css/styles.css index be5eef0..f09174d 100644 --- a/css/styles.css +++ b/css/styles.css @@ -746,20 +746,20 @@ table tr.rowtitle td:last-child { .color4 { background-color: #999999 } /* table row colors for ratings (alternating colors for rows) */ -tr:nth-child(odd) td.Platinum { background-color: #333333 !important; color: #ffffff !important; } -tr:nth-child(even) td.Platinum { background-color: #666666 !important; color: #ffffff !important; } +tr:nth-child(odd) td.Platinum { background-color: #E5E4E2 !important; } +tr:nth-child(even) td.Platinum { background-color: #F5F5F5 !important; } tr:nth-child(odd) td.Gold { background-color: #FFF600 !important; } tr:nth-child(even) td.Gold { background-color: #fffcb3 !important; } -tr:nth-child(odd) td.Silver { background-color: #C0C0C0 !important; } -tr:nth-child(even) td.Silver { background-color: #e6e6e6 !important; } +tr:nth-child(odd) td.Silver { background-color: #A9A9A9 !important; } +tr:nth-child(even) td.Silver { background-color: #D3D3D3 !important; } -tr:nth-child(odd) td.Bronze { background-color: #FCBA0A !important; } +tr:nth-child(odd) td.Bronze { background-color: #DAA520 !important; } tr:nth-child(even) td.Bronze { background-color: #FCBA0A !important; } tr:nth-child(odd) td.Garbage { background-color: #999966 !important; } -tr:nth-child(even) td.Garbage { background-color: #ebebe0 !important; } +tr:nth-child(even) td.Garbage { background-color: #BDB76B !important; } /* labels */ TD.label { font-weight: bold }

1 0

Rosanne DiMesio : Order screenshot queue by submitTime
by Jeremy Newman Sept. 11, 2017

Sept. 11, 2017

Module: appdb Branch: master Commit: c807880551bee62d5465071795181065871af7af URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c807880551bee62d54650717… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 12:54:25 2017 -0500 Order screenshot queue by submitTime Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/appData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/appData.php b/include/appData.php index 87f751d..52ba8b0 100644 --- a/include/appData.php +++ b/include/appData.php @@ -517,7 +517,7 @@ class appData AND appData.state = '?' AND - appData.type = '?' $sVersionWhereFilter$sWhereFilter ORDER BY appFamily.appName $sLimit + appData.type = '?' $sVersionWhereFilter$sWhereFilter ORDER BY appData.submitTime, appFamily.appName $sLimit )"; if(!$iRows && !$iStart) {

1 0

Rosanne DiMesio : Change extra comments to match other textareas
by Jeremy Newman Sept. 11, 2017

Sept. 11, 2017

Module: appdb Branch: master Commit: 0c964b6dfefedcf2f028eb46dbbcf727da61261b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0c964b6dfefedcf2f028eb46… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 10:09:52 2017 -0500 Change extra comments to match other textareas Makes the input field on the test report form wysiwyg and removes the pre-formatted text styling from the test results display so that it matches the other textareas in the test report. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/testData.php b/include/testData.php index 7f05db2..86771d2 100644 --- a/include/testData.php +++ b/include/testData.php @@ -584,7 +584,7 @@ class testData{ "Workarounds\n{$this->shWorkarounds}\n". "What was not tested\n{$this->shWhatNotTested}\n". "Hardware tested\nGraphics: </ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". - "Additional Comments\n<pre style='white-space: pre-wrap;'>{$this->sComments}</pre>\n"; + "Additional Comments\n{$this->sComments}\n"; } function CreateTestTable() @@ -907,7 +907,7 @@ class testData{ echo '<a href="https://wiki.winehq.org/AppDB_Maintainer_Rating_Definitions" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td>Extra comments</td>',"\n"; - echo '<td><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; + echo '<td><textarea name="sComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; echo $this->sComments.'</textarea></td></tr>',"\n"; /* Graphics hardware/driver

1 0

Francois Gouget : gdiplus: Add a trailing linefeed to an ERR() message.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: cbacc556ec1cd0cffe42ae43cd1db1bd4d22e149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbacc556ec1cd0cffe42ae43c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:13:17 2017 +0200 gdiplus: Add a trailing linefeed to an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ea02c6b..9ca1d4e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6668,7 +6668,7 @@ GpStatus gdi_transform_release(GpGraphics *graphics) { if (graphics->gdi_transform_acquire_count <= 0) { - ERR("called without matching gdi_transform_acquire"); + ERR("called without matching gdi_transform_acquire\n"); return GenericError; } if (graphics->gdi_transform_acquire_count == 1 && graphics->hdc)

1 0

Alexandre Julliard : ntdll: Disallow changing PAGE_NOCACHE flag for individual pages.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 08acac0864521e1f6886682ad1ac06fa61e3c351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08acac0864521e1f6886682ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 8 12:41:01 2017 +0200 ntdll: Disallow changing PAGE_NOCACHE flag for individual pages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 69 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 2 ++ 2 files changed, 71 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 538de70..76953d5 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -362,6 +362,75 @@ static void test_VirtualAlloc(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* PAGE_NOCACHE cannot be set per page in recent Windows */ + addr1 = VirtualAlloc( NULL, 0x2000, MEM_COMMIT, PAGE_READWRITE | PAGE_NOCACHE ); + ok( addr1 != NULL, "VirtualAlloc failed\n"); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == (PAGE_READWRITE | PAGE_NOCACHE), + "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x2000, "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == (PAGE_READWRITE | PAGE_NOCACHE), "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualProtect(addr1, 0x1000, PAGE_READWRITE, &old_prot), "VirtualProtect failed\n"); + ok( old_prot == (PAGE_READWRITE | PAGE_NOCACHE), "wrong protect %x\n", old_prot ); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == (PAGE_READWRITE | PAGE_NOCACHE), + "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x2000 || broken(info.RegionSize == 0x1000), + "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == (PAGE_READWRITE | PAGE_NOCACHE) || broken(info.Protect == PAGE_READWRITE), + "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualProtect(addr1, 0x1000, PAGE_READONLY, &old_prot), "VirtualProtect failed\n"); + ok( old_prot == (PAGE_READWRITE | PAGE_NOCACHE) || broken(old_prot == PAGE_READWRITE), + "wrong protect %x\n", old_prot ); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == (PAGE_READWRITE | PAGE_NOCACHE), + "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x1000, "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == (PAGE_READONLY | PAGE_NOCACHE) || broken(info.Protect == PAGE_READONLY), + "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); + + addr1 = VirtualAlloc( NULL, 0x2000, MEM_COMMIT, PAGE_READWRITE ); + ok( addr1 != NULL, "VirtualAlloc failed\n"); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == PAGE_READWRITE, + "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x2000, "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == PAGE_READWRITE, "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualProtect(addr1, 0x1000, PAGE_READONLY | PAGE_NOCACHE, &old_prot), "VirtualProtect failed\n"); + ok( old_prot == PAGE_READWRITE, "wrong protect %x\n", old_prot ); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == PAGE_READWRITE, "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x1000, "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == PAGE_READONLY || broken(info.Protect == (PAGE_READONLY | PAGE_NOCACHE)), + "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* memory returned by VirtualAlloc should be aligned to 64k */ addr1 = VirtualAlloc(0, 0x2000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr1 != NULL, "VirtualAlloc failed\n"); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 990b754..f398fcc 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2369,6 +2369,8 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T if (!view->mapping || is_compatible_protection( view, new_vprot )) { new_vprot |= VPROT_COMMITTED; + if (view->protect & VPROT_NOCACHE) new_vprot |= VPROT_NOCACHE; + else new_vprot &= ~VPROT_NOCACHE; if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; }

1 0

Martin Storsjo : msvcrt: Implement setjmp/longjmp on aarch64.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 3d3d0806886b7a4d6470ed97a6368926059dc034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3d0806886b7a4d6470ed97a… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Sep 8 09:47:33 2017 +0300 msvcrt: Implement setjmp/longjmp on aarch64. Also include the rest of except_*.c (based on except_arm.c) as stubs. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 16 +- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 +- dlls/crtdll/crtdll.spec | 6 +- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr100/msvcr100.spec | 20 +- dlls/msvcr110/Makefile.in | 1 + dlls/msvcr110/msvcr110.spec | 20 +- dlls/msvcr120/Makefile.in | 1 + dlls/msvcr120/msvcr120.spec | 20 +- dlls/msvcr120_app/msvcr120_app.spec | 20 +- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr70/msvcr70.spec | 14 +- dlls/msvcr71/Makefile.in | 1 + dlls/msvcr71/msvcr71.spec | 16 +- dlls/msvcr80/Makefile.in | 1 + dlls/msvcr80/msvcr80.spec | 20 +- dlls/msvcr90/Makefile.in | 1 + dlls/msvcr90/msvcr90.spec | 20 +- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except_arm64.c | 237 +++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 22 ++ dlls/msvcrt/msvcrt.spec | 20 +- dlls/msvcrt20/msvcrt20.spec | 8 +- dlls/msvcrt40/msvcrt40.spec | 8 +- dlls/msvcrtd/msvcrtd.spec | 8 +- dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 20 +- dlls/vcruntime140/vcruntime140.spec | 16 +- include/msvcrt/setjmp.h | 27 +++ include/winnt.h | 39 ++++ 30 files changed, 462 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d3d0806886b7a4d6470e…

1 0

Alistair Leslie-Hughes : include: Add IMFSinkWriterEx interface.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 40083c2b8dffe9971df26406de435ef1b001acfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=40083c2b8dffe9971df26406d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 8 05:29:39 2017 +0000 include: Add IMFSinkWriterEx interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 5cb3501..834aa09 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -15,10 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "unknwn.idl"; -import "objidl.idl"; -import "oaidl.idl"; + import "mfobjects.idl"; +import "mftransform.idl"; enum { @@ -121,6 +120,17 @@ interface IMFSinkWriter : IUnknown HRESULT GetStatistics([in] DWORD index, [out] MF_SINK_WRITER_STATISTICS *stats); }; +[ + object, + uuid(588d72ab-5Bc1-496a-8714-b70617141b25), + local +] +interface IMFSinkWriterEx : IMFSinkWriter +{ + HRESULT GetTransformForStream([in] DWORD index, [in] DWORD tindex, [out] GUID *category, + [out] IMFTransform **transform); +} + cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," )

1 0

Vincent Povirk : winemenubuilder: Set StartupWMClass for shortcuts to exe files.
by Alexandre Julliard Sept. 8, 2017

Sept. 8, 2017

Module: wine Branch: master Commit: 917e86dd7a4cca1da47262caaded2bef9e022f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=917e86dd7a4cca1da47262caa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 8 10:54:30 2017 -0500 winemenubuilder: Set StartupWMClass for shortcuts to exe files. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 44 ++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 154b575..0013b04 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1446,13 +1446,14 @@ static DWORD register_menus_entry(const char *unix_file, const char *windows_fil static BOOL write_desktop_entry(const char *unix_link, const char *location, const char *linkname, const char *path, const char *args, const char *descr, - const char *workdir, const char *icon) + const char *workdir, const char *icon, const char *wmclass) { FILE *file; - WINE_TRACE("(%s,%s,%s,%s,%s,%s,%s,%s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(location), + WINE_TRACE("(%s,%s,%s,%s,%s,%s,%s,%s,%s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(location), wine_dbgstr_a(linkname), wine_dbgstr_a(path), wine_dbgstr_a(args), - wine_dbgstr_a(descr), wine_dbgstr_a(workdir), wine_dbgstr_a(icon)); + wine_dbgstr_a(descr), wine_dbgstr_a(workdir), wine_dbgstr_a(icon), + wine_dbgstr_a(wmclass)); file = fopen(location, "w"); if (file == NULL) @@ -1470,6 +1471,8 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con fprintf(file, "Path=%s\n", workdir); if (icon && lstrlenA(icon)) fprintf(file, "Icon=%s\n", icon); + if (wmclass && lstrlenA(wmclass)) + fprintf(file, "StartupWMClass=%s\n", wmclass); fclose(file); @@ -1615,7 +1618,7 @@ end: } static BOOL write_menu_entry(const char *unix_link, const char *link, const char *path, const char *args, - const char *descr, const char *workdir, const char *icon) + const char *descr, const char *workdir, const char *icon, const char *wmclass) { const char *linkname; char *desktopPath = NULL; @@ -1623,9 +1626,9 @@ static BOOL write_menu_entry(const char *unix_link, const char *link, const char char *filename = NULL; BOOL ret = TRUE; - WINE_TRACE("(%s, %s, %s, %s, %s, %s, %s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(link), + WINE_TRACE("(%s, %s, %s, %s, %s, %s, %s, %s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(link), wine_dbgstr_a(path), wine_dbgstr_a(args), wine_dbgstr_a(descr), - wine_dbgstr_a(workdir), wine_dbgstr_a(icon)); + wine_dbgstr_a(workdir), wine_dbgstr_a(icon), wine_dbgstr_a(wmclass)); linkname = strrchr(link, '/'); if (linkname == NULL) @@ -1649,7 +1652,7 @@ static BOOL write_menu_entry(const char *unix_link, const char *link, const char goto end; } *desktopDir = '/'; - if (!write_desktop_entry(unix_link, desktopPath, linkname, path, args, descr, workdir, icon)) + if (!write_desktop_entry(unix_link, desktopPath, linkname, path, args, descr, workdir, icon, wmclass)) { WINE_WARN("couldn't make desktop entry %s\n", wine_dbgstr_a(desktopPath)); ret = FALSE; @@ -2771,9 +2774,10 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; char *escaped_path = NULL, *escaped_args = NULL, *description = NULL; + char *wmclass = NULL; WCHAR szTmp[INFOTIPSIZE]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; - WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH]; + WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH], szWMClass[MAX_PATH]; int iIconId = 0, r = -1; DWORD csidl = -1; HANDLE hsem = NULL; @@ -2818,6 +2822,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) ExpandEnvironmentStringsW(szTmp, szIconPath, MAX_PATH); WINE_TRACE("icon file : %s\n", wine_dbgstr_w(szIconPath) ); + szWMClass[0] = 0; + if( !szPath[0] ) { LPITEMIDLIST pidl = NULL; @@ -2880,6 +2886,14 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) GetWindowsDirectoryW(szPath, MAX_PATH); lstrcatW(szPath, startW); } + else + { + /* FIXME: Use AppUserModelID if present. */ + WCHAR *p = PathFindFileNameW(szPath); + + lstrcpyW(szWMClass, p); + CharLowerW(szWMClass); + } /* convert app working dir */ if (szWorkDir[0]) @@ -2897,7 +2911,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) escaped_path = escape(szPath); escaped_args = escape(szArgs); description = wchars_to_utf8_chars(szDescription); - if (escaped_path == NULL || escaped_args == NULL || description == NULL) + wmclass = wchars_to_utf8_chars(szWMClass); + if (escaped_path == NULL || escaped_args == NULL || description == NULL || wmclass == NULL) { WINE_ERR("out of memory allocating/escaping parameters\n"); goto cleanup; @@ -2936,12 +2951,12 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (link_arg) { r = !write_desktop_entry(unix_link, location, lastEntry, - start_path, link_arg, description, work_dir, icon_name); + start_path, link_arg, description, work_dir, icon_name, wmclass); HeapFree(GetProcessHeap(), 0, link_arg); } } else - r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name); + r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name, wmclass); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); @@ -2952,7 +2967,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) char *link_arg = escape_unix_link_arg(unix_link); if (link_arg) { - r = !write_menu_entry(unix_link, link_name, start_path, link_arg, description, work_dir, icon_name); + r = !write_menu_entry(unix_link, link_name, start_path, link_arg, description, work_dir, icon_name, wmclass); HeapFree(GetProcessHeap(), 0, link_arg); } } @@ -2967,6 +2982,7 @@ cleanup: HeapFree( GetProcessHeap(), 0, escaped_args ); HeapFree( GetProcessHeap(), 0, escaped_path ); HeapFree( GetProcessHeap(), 0, description ); + HeapFree( GetProcessHeap(), 0, wmclass ); HeapFree( GetProcessHeap(), 0, unix_link ); HeapFree( GetProcessHeap(), 0, start_path ); @@ -3102,14 +3118,14 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { - r = !write_desktop_entry(NULL, location, lastEntry, start_path, escaped_urlPath, NULL, NULL, icon_name); + r = !write_desktop_entry(NULL, location, lastEntry, start_path, escaped_urlPath, NULL, NULL, icon_name, NULL); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } else - r = !write_menu_entry(unix_link, link_name, start_path, escaped_urlPath, NULL, NULL, icon_name); + r = !write_menu_entry(unix_link, link_name, start_path, escaped_urlPath, NULL, NULL, icon_name, NULL); ret = (r == 0); ReleaseSemaphore(hSem, 1, NULL);

1 0