August 2019 - Wine-commits - list.winehq.org

Józef Kucia : include: Move debug interfaces to vkd3d_d3d12sdklayers.h.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: vkd3d Branch: master Commit: 332b250e82a16bd1f5d6eec7659a834604452ec2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=332b250e82a16bd1f5d6eec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 1 18:10:58 2019 +0200 include: Move debug interfaces to vkd3d_d3d12sdklayers.h. 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> --- Makefile.am | 2 ++ include/.gitignore | 1 + include/vkd3d_d3d12.idl | 24 ---------------------- include/vkd3d_d3d12sdklayers.idl | 43 ++++++++++++++++++++++++++++++++++++++++ tests/d3d12_crosstest.h | 1 + 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe3a363..2b0e8f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ AM_LDFLAGS = -no-undefined widl_headers = \ include/vkd3d_d3d12.h \ + include/vkd3d_d3d12sdklayers.h \ include/vkd3d_d3dcommon.h \ include/vkd3d_dxgi.h \ include/vkd3d_dxgi1_2.h \ @@ -17,6 +18,7 @@ widl_headers = \ vkd3d_public_headers = \ include/vkd3d.h \ include/vkd3d_d3d12.h \ + include/vkd3d_d3d12sdklayers.h \ include/vkd3d_d3dcommon.h \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ diff --git a/include/.gitignore b/include/.gitignore index d21fd99..7ed2b78 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -2,6 +2,7 @@ config.h config.h.in stamp-h1 vkd3d_d3d12.h +vkd3d_d3d12sdklayers.h vkd3d_d3dcommon.h vkd3d_dxgi.h vkd3d_dxgi1_2.h diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 067db8d..8489f56 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2319,30 +2319,6 @@ interface ID3D12Device1 : ID3D12Device } [ - uuid(344488b7-6846-474b-b989-f027448245e0), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug : IUnknown -{ - void EnableDebugLayer(); -} - -[ - uuid(affaa4ca-63fe-4d8e-b8ad-159000af4304), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug1 : IUnknown -{ - void EnableDebugLayer(); - void SetEnableGPUBasedValidation(BOOL enable); - void SetEnableSynchronizedCommandQueueValidation(BOOL enable); -} - -[ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, local, diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl new file mode 100644 index 0000000..7663462 --- /dev/null +++ b/include/vkd3d_d3d12sdklayers.idl @@ -0,0 +1,43 @@ +/* + * Copyright 2016-2019 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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 "vkd3d_d3d12.idl"; + +[ + uuid(344488b7-6846-474b-b989-f027448245e0), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug : IUnknown +{ + void EnableDebugLayer(); +} + +[ + uuid(affaa4ca-63fe-4d8e-b8ad-159000af4304), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug1 : IUnknown +{ + void EnableDebugLayer(); + void SetEnableGPUBasedValidation(BOOL enable); + void SetEnableSynchronizedCommandQueueValidation(BOOL enable); +} diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 1f7e764..7b59471 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -45,6 +45,7 @@ typedef int HRESULT; #include "vkd3d_windows.h" #define WIDL_C_INLINE_WRAPPERS #include "vkd3d_d3d12.h" +#include "vkd3d_d3d12sdklayers.h" #include <inttypes.h> #include <limits.h>

1 0

Julian Rüger : German translation for release 4.12.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: website Branch: master Commit: f5d355c73f3f416ca233e45d92b5bd200ae3aa61 URL: https://source.winehq.org/git/website.git/?a=commit;h=f5d355c73f3f416ca233e… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jul 8 12:34:29 2019 +0200 German translation for release 4.12. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019070501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2019070501.xml b/news/de/2019070501.xml new file mode 100644 index 0000000..91e3f28 --- /dev/null +++ b/news/de/2019070501.xml @@ -0,0 +1,16 @@ +<news> +<date>5. Juli 2019</date> +<title>Wine 4.12 freigegeben</title> +<body> + Die Entwicklungsversion 4.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere DLLs werden standardmäßig als PE-Dateien übersetzt.</li> + <li>Unterstützung von Plug&Play-Gerätetreibern.</li> + <li>Bessere Unterstützung des Visual-Studio-Remote-Debuggers.</li> + <li>Weitere Unterstützung für das Enumerieren von Anzeigegeräten.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.12.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.12.1.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: website Branch: master Commit: 306f8a39bbbb7811e56c6d1386855037865913a3 URL: https://source.winehq.org/git/website.git/?a=commit;h=306f8a39bbbb7811e56c6… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jul 8 12:35:32 2019 +0200 German translation for release 4.12.1. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019070701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2019070701.xml b/news/de/2019070701.xml new file mode 100644 index 0000000..5a47663 --- /dev/null +++ b/news/de/2019070701.xml @@ -0,0 +1,12 @@ +<news> +<date>7. Juli 2019</date> +<title>Wine 4.12.1 freigegeben</title> +<body> + Die Entwicklungsversion 4.12.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.12.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Korrektur der fehlerhaften Prefix-Initialisierung unter 64-Bit.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.12.1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot: Rerun make_vulkan when it is patched.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: tools Branch: master Commit: 69df3676114def9e457775cf9a79d78fef0abc83 URL: https://source.winehq.org/git/tools.git/?a=commit;h=69df3676114def9e457775c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 30 00:20:40 2019 +0200 testbot: Rerun make_vulkan when it is patched. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 254c762..61b47a7 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -125,6 +125,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeVulkan}) + { + InfoMsg "\nRunning make_vulkan\n"; + system("cd '$DataDir/$Dir' && set -x && ./dlls/winevulkan/make_vulkan"); + if ($? != 0) + { + LogMsg "make_vulkan failed\n"; + return undef; + } + } if ($Impacts->{MakeMakefiles}) { diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index f72cef5..d96b14a 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -325,6 +325,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new"; @@ -370,7 +375,8 @@ sub GetPatchImpacts($) # Also backup the build-related fields. foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests", - "PatchedRoot", "PatchedModules", "PatchedTests") + "MakeVulkan", "PatchedRoot", "PatchedModules", + "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -464,6 +470,7 @@ sub GetPatchImpacts($) $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; $Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests}; + $Impacts->{MakeVulkan} ||= $PastImpacts->{MakeVulkan}; $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};

1 0

Chip Davis : kernel32: Forward power request functions to ntdll.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 49ffaddf9bc4d3fbf73abb16c31dec48b48b9a6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=49ffaddf9bc4d3fbf73abb16… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jul 31 21:40:29 2019 -0500 kernel32: Forward power request functions to ntdll. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 53 +++++++++++++++++++++++++++++++++++++---------- include/winnt.h | 5 +++++ 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 056dd9d..190dc01 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -19,10 +19,15 @@ #include <stdarg.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(powermgnt); @@ -113,10 +118,36 @@ EXECUTION_STATE WINAPI SetThreadExecutionState(EXECUTION_STATE flags) */ HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) { - FIXME("(%p): stub\n", context); + COUNTED_REASON_CONTEXT nt_context; + HANDLE handle; + NTSTATUS status; + WCHAR module_name[MAX_PATH]; + + TRACE( "(%p)\n", context ); + + nt_context.Version = context->Version; + nt_context.Flags = context->Flags; + if (context->Flags & POWER_REQUEST_CONTEXT_SIMPLE_STRING) + RtlInitUnicodeString( &nt_context.u.SimpleString, context->Reason.SimpleReasonString ); + else if (context->Flags & POWER_REQUEST_CONTEXT_DETAILED_STRING) + { + int i; + + GetModuleFileNameW( context->Reason.Detailed.LocalizedReasonModule, module_name, ARRAY_SIZE(module_name) ); + RtlInitUnicodeString( &nt_context.u.s.ResourceFileName, module_name ); + nt_context.u.s.ResourceReasonId = context->Reason.Detailed.LocalizedReasonId; + nt_context.u.s.StringCount = context->Reason.Detailed.ReasonStringCount; + nt_context.u.s.ReasonStrings = heap_alloc( nt_context.u.s.StringCount * sizeof(UNICODE_STRING) ); + for (i = 0; i < nt_context.u.s.StringCount; i++) + RtlInitUnicodeString( &nt_context.u.s.ReasonStrings[i], context->Reason.Detailed.ReasonStrings[i] ); + } - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return INVALID_HANDLE_VALUE; + status = NtCreatePowerRequest( &handle, &nt_context ); + if (nt_context.Flags & POWER_REQUEST_CONTEXT_DETAILED_STRING) + heap_free( nt_context.u.s.ReasonStrings ); + if (status) + SetLastError( RtlNtStatusToDosError(status) ); + return status == STATUS_SUCCESS ? handle : INVALID_HANDLE_VALUE; } /*********************************************************************** @@ -124,10 +155,10 @@ HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) */ BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) { - FIXME("(%p, %u): stub\n", request, type); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status = NtSetPowerRequest( request, type ); + if (status) + SetLastError( RtlNtStatusToDosError(status) ); + return status == STATUS_SUCCESS; } /*********************************************************************** @@ -135,8 +166,8 @@ BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) */ BOOL WINAPI PowerClearRequest(HANDLE request, POWER_REQUEST_TYPE type) { - FIXME("(%p, %u): stub\n", request, type); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status = NtClearPowerRequest( request, type ); + if (status) + SetLastError( RtlNtStatusToDosError(status) ); + return status == STATUS_SUCCESS; } diff --git a/include/winnt.h b/include/winnt.h index 613f858..d8aae39 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5585,6 +5585,11 @@ typedef enum _POWER_REQUEST_TYPE PowerRequestAwayModeRequired } POWER_REQUEST_TYPE, *PPOWER_REQUEST_TYPE; +#define POWER_REQUEST_CONTEXT_VERSION 0 + +#define POWER_REQUEST_CONTEXT_SIMPLE_STRING 0x00000001 +#define POWER_REQUEST_CONTEXT_DETAILED_STRING 0x00000002 + typedef union _FILE_SEGMENT_ELEMENT { PVOID64 Buffer; ULONGLONG Alignment;

1 0

Gijs Vermeulen : wmp/tests: Add more IWMPMedia name handling tests.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 53ac8e7b113b5fbc78f2168252d937a6d757bddb URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ac8e7b113b5fbc78f21682… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 15:07:54 2019 +0200 wmp/tests: Add more IWMPMedia name handling tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/media.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index dd6fdcb..c190eee 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -489,11 +489,40 @@ playback_skip: static void test_media_item(void) { + static const WCHAR slashW[] = {'\\',0}; static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR fooW[] = {'f','o','o',':','/','/',0}; + static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; + static const WCHAR httpsW[] = {'h','t','t','p','s',':','/','/',0}; + static const WCHAR invalidurlW[] = {'i','n','v','a','l','i','d','_','u','r','l',0}; + static const WCHAR invalidurlmp3W[] = {'i','n','v','a','l','i','d','_','u','r','l','.','m','p','3',0}; + static const WCHAR winehqurlW[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','t','e','s','t','.','m','p','3',0}; + static WCHAR pathW[MAX_PATH]; + static WCHAR currentdirW[MAX_PATH]; + struct { + const WCHAR *prefix; + const WCHAR *filename; + const WCHAR *expected; + } tests[] = { + { NULL, invalidurlmp3W, invalidurlW }, + { currentdirW, mp3file, testW }, + { currentdirW, invalidurlmp3W, invalidurlW }, + { httpW, winehqurlW, testW }, + { httpW, invalidurlmp3W, invalidurlmp3W }, + { httpsW, winehqurlW, testW }, + { httpsW, invalidurlmp3W, invalidurlmp3W }, + { fileW, mp3file, testW }, + { fileW, invalidurlmp3W, invalidurlW }, + { fooW, mp3file, mp3file }, + { fooW, invalidurlmp3W, invalidurlmp3W } + }; IWMPMedia *media, *media2; IWMPPlayer4 *player; HRESULT hr; BSTR str; + int i; hr = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IWMPPlayer4, (void **)&player); if (hr == REGDB_E_CLASSNOTREG) @@ -505,6 +534,9 @@ static void test_media_item(void) hr = IWMPPlayer4_newMedia(player, NULL, &media); ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + hr = IWMPMedia_get_name(media, NULL); +todo_wine + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); ok(*str == 0, "Unexpected name %s.\n", wine_dbgstr_w(str)); @@ -542,7 +574,15 @@ static void test_media_item(void) hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); todo_wine - ok(!lstrcmpW(str, testW), "Unexpected name %s.\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); + SysFreeString(str); + hr = IWMPMedia_put_name(media, NULL); +todo_wine + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IWMPMedia_get_name(media, &str); + ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); hr = IWMPPlayer4_put_currentMedia(player, media); @@ -555,10 +595,32 @@ todo_wine hr = IWMPMedia_get_name(media2, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); todo_wine - ok(!lstrcmpW(str, testW), "Unexpected name %s.\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media2); + GetCurrentDirectoryW(ARRAY_SIZE(currentdirW), currentdirW); + lstrcatW(currentdirW, slashW); + + for (i=0; i<ARRAY_SIZE(tests); i++) + { + + pathW[0] = '\0'; + if(tests[i].prefix) lstrcatW(pathW, tests[i].prefix); + lstrcatW(pathW, tests[i].filename); + + str = SysAllocString(pathW); + hr = IWMPPlayer4_newMedia(player, str, &media); + ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + SysFreeString(str); + hr = IWMPMedia_get_name(media, &str); + ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(str, tests[i].expected), "Expected %s, got %s\n", wine_dbgstr_w(tests[i].expected), wine_dbgstr_w(str)); + SysFreeString(str); + IWMPMedia_Release(media); + } + IWMPPlayer4_Release(player); }

1 0

Gijs Vermeulen : wmp: Implement IWMPMedia::put/get_name.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 3b0e8197613dcafbf67f8c1792a7456acdf73017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b0e8197613dcafbf67f8c17… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 15:07:55 2019 +0200 wmp: Implement IWMPMedia::put/get_name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47029 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/Makefile.in | 2 +- dlls/wmp/player.c | 61 ++++++++++++++++++++++++++++++++++++++++++++------ dlls/wmp/tests/media.c | 5 ----- dlls/wmp/wmp_private.h | 1 + 4 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 5ed3d42..333717c 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,5 +1,5 @@ MODULE = wmp.dll -IMPORTS = oleaut32 ole32 user32 gdi32 +IMPORTS = oleaut32 ole32 urlmon shlwapi user32 gdi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 7a1befe..5673d0e 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include <nserror.h> #include "wmpids.h" +#include "shlwapi.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -1730,6 +1731,7 @@ static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) if(!ref) { heap_free(This->url); + heap_free(This->name); heap_free(This); } @@ -1789,17 +1791,21 @@ static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *name) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, name); + TRACE("(%p)->(%p)\n", This, name); - /* FIXME: this should be a display name */ - return return_bstr(This->url, name); + return return_bstr(This->name, name); } -static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR pbstrName) +static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR name) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pbstrName)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(name)); + + if (!name) return E_POINTER; + + This->name = heap_strdupW(name); + return S_OK; } static HRESULT WINAPI WMPMedia_get_imageSourceWidth(IWMPMedia *iface, LONG *pWidth) @@ -2022,13 +2028,54 @@ WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) { WMPMedia *media; + IUri *uri; + BSTR path; + HRESULT hr; + WCHAR *name_dup, slashW[] = {'/',0}; media = heap_alloc_zero(sizeof(*media)); if (!media) return E_OUTOFMEMORY; media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; - media->url = url ? heap_strdupW(url) : heap_strdupW(emptyW); + + if (url) + { + media->url = heap_strdupW(url); + name_dup = heap_strdupW(url); + + hr = CreateUri(name_dup, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); + if (FAILED(hr)) + { + heap_free(name_dup); + return hr; + } + hr = IUri_GetPath(uri, &path); + if (hr != S_OK) + { + heap_free(name_dup); + IUri_Release(uri); + return hr; + } + + /* GetPath() will return "/" for invalid uri's + * only strip extension when uri is valid + */ + if (wcscmp(path, slashW) != 0) + PathRemoveExtensionW(name_dup); + PathStripPathW(name_dup); + + media->name = name_dup; + + SysFreeString(path); + IUri_Release(uri); + } + else + { + media->url = heap_strdupW(emptyW); + media->name = heap_strdupW(emptyW); + } + media->duration = duration; media->ref = 1; diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c190eee..3d750e1 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -573,15 +573,12 @@ todo_wine SysFreeString(str); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); hr = IWMPMedia_put_name(media, NULL); -todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); @@ -594,7 +591,6 @@ todo_wine ok(media2 != NULL, "Unexpected media instance.\n"); hr = IWMPMedia_get_name(media2, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media2); @@ -615,7 +611,6 @@ todo_wine SysFreeString(str); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(str, tests[i].expected), "Expected %s, got %s\n", wine_dbgstr_w(tests[i].expected), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 27ec55e..5149d73 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -56,6 +56,7 @@ typedef struct { LONG ref; WCHAR *url; + WCHAR *name; DOUBLE duration; } WMPMedia;

1 0

Gijs Vermeulen : wmp: Return E_POINTER when p is NULL in return_bstr.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: bf3d719d08c38e1c9e215f37ac03fe53b88380b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3d719d08c38e1c9e215f37… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 15:07:56 2019 +0200 wmp: Return E_POINTER when p is NULL in return_bstr. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/media.c | 1 - dlls/wmp/wmp_private.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 3d750e1..7e76aee 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -535,7 +535,6 @@ static void test_media_item(void) hr = IWMPPlayer4_newMedia(player, NULL, &media); ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); hr = IWMPMedia_get_name(media, NULL); -todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 5149d73..0b1b023 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -135,7 +135,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) { if(!p) - return E_INVALIDARG; + return E_POINTER; if(value) { *p = SysAllocString(value);

1 0

Gijs Vermeulen : wmp: Fake success in IWMPMedia::getItemInfo.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: eccd8c5424c16a70e3fec9efeaf73a60364f4062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eccd8c5424c16a70e3fec9ef… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 15:07:57 2019 +0200 wmp: Fake success in IWMPMedia::getItemInfo. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 5673d0e..fc4439d 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1874,11 +1874,11 @@ static HRESULT WINAPI WMPMedia_getAttributeName(IWMPMedia *iface, LONG lIndex, B return E_NOTIMPL; } -static HRESULT WINAPI WMPMedia_getItemInfo(IWMPMedia *iface, BSTR bstrItemName, BSTR *pbstrVal) +static HRESULT WINAPI WMPMedia_getItemInfo(IWMPMedia *iface, BSTR item_name, BSTR *value) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_w(bstrItemName), pbstrVal); - return E_NOTIMPL; + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(item_name), value); + return return_bstr(NULL, value); } static HRESULT WINAPI WMPMedia_setItemInfo(IWMPMedia *iface, BSTR bstrItemName, BSTR bstrVal)

1 0

Gijs Vermeulen : wmp: Add IWMPPlaylist stub.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 559842ffc15f85b54a8731b6c6603468f9dd740b URL: https://source.winehq.org/git/wine.git/?a=commit;h=559842ffc15f85b54a8731b6… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 18:14:31 2019 +0200 wmp: Add IWMPPlaylist stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 15 +++ dlls/wmp/wmp_private.h | 12 +++ 3 files changed, 279 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=559842ffc15f85b54a87…

1 0