March 2020 - Wine-commits - list.winehq.org

Vijay Kiran Kamuju : wmvcore: Add semi-stub implementation for WMIsContentProtected.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: f0dbd3addc3140e3b92785ca42c1c1df00469f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0dbd3addc3140e3b92785ca… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Feb 29 21:55:59 2020 +0100 wmvcore: Add semi-stub implementation for WMIsContentProtected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48683 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++++ dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 12 ++++++++++++ include/wmsdkidl.idl | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 8af34e22b6..2b5a4555a3 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -338,6 +338,23 @@ static void test_urlextension(void) todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); } +static void test_iscontentprotected(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + BOOL drm; + + hr = WMIsContentProtected(NULL, NULL); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(NULL, &drm); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(mp3file, NULL); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + hr = WMIsContentProtected(mp3file, &drm); + ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); + ok(drm == FALSE, "got %0dx\n", drm); +} + START_TEST(wmvcore) { HRESULT hr; @@ -353,6 +370,7 @@ START_TEST(wmvcore) test_profile_manager_interfaces(); test_WMCreateWriterPriv(); test_urlextension(); + test_iscontentprotected(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 65e0807b61..8c3e62bbb1 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -17,4 +17,4 @@ @ stub WMCreateWriterNetworkSink @ stdcall WMCreateWriterPriv(ptr) @ stub WMCreateWriterPushSink -@ stub WMIsContentProtected +@ stdcall WMIsContentProtected(wstr ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index af23ab88b8..4dafcf8055 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -86,6 +86,18 @@ HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **lic return E_NOTIMPL; } +HRESULT WINAPI WMIsContentProtected(const WCHAR *filename, BOOL *protected) +{ + FIXME("(%s %p): semi-stub\n", wine_dbgstr_w(filename), protected); + + if (!filename || !protected) + return E_INVALIDARG; + + *protected = FALSE; + + return S_FALSE; +} + typedef struct { IWMProfileManager2 IWMProfileManager2_iface; LONG ref; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 4ee166a9d4..d1e0445470 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1896,6 +1896,7 @@ cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") cpp_quote("HRESULT WINAPI WMCreateEditor(IWMMetadataEditor**);") cpp_quote("HRESULT WINAPI WMCreateBackupRestorer(IUnknown*,IWMLicenseBackup**);") cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") +cpp_quote("HRESULT WINAPI WMIsContentProtected(const WCHAR*, BOOL*);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Francois Gouget : testbot/WinePatchesMLSubmit: Add a semi-colon.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: tools Branch: master Commit: 93e5c34f072c1061c413b1df6f4beb13149997e7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=93e5c34f072c1061c413b1d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:54:20 2020 +0100 testbot/WinePatchesMLSubmit: Add a semi-colon. It's at the end of a block and thus optional but all other blocks have one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WinePatchesMLSubmit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 4797e98..92c769f 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -65,7 +65,7 @@ if (defined $ErrMessage) { # The Engine will pick up the email later so return success anyway. # But still log the issue so it can be checked out. - LogMsg "$ErrMessage\n" + LogMsg "$ErrMessage\n"; } exit 0;

1 0

Francois Gouget : testbot/build: Simplify the --no-rm handling.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: tools Branch: master Commit: 443e63563411f8edd6caedf20ae7aab9213e2772 URL: https://source.winehq.org/git/tools.git/?a=commit;h=443e63563411f8edd6caedf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:55:03 2020 +0100 testbot/build: Simplify the --no-rm handling. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 6 ++++-- testbot/bin/build/WineReconfig.pl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index f0ed128..62644e1 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -40,6 +40,8 @@ sub BEGIN $::BuildEnv = 1; } +use File::Path; + use Build::Utils; use WineTestBot::Config; use WineTestBot::Missions; @@ -53,13 +55,13 @@ sub BuildNative($) { my ($NoRm) = @_; + rmtree "$DataDir/wine-native" if (!$NoRm); mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); system("cd '$DataDir/wine-native' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount __tooldeps__"); @@ -77,6 +79,7 @@ sub BuildCross($$$) my ($TaskMissions, $NoRm, $Build) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); + rmtree "$DataDir/wine-$Build" if (!$NoRm); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # Rebuild from scratch to make sure cruft will not accumulate @@ -84,7 +87,6 @@ sub BuildCross($$$) my $CPUCount = GetCPUCount(); my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("cd '$DataDir/wine-$Build' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount buildtests"); if ($? != 0) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 835be46..ad0d429 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,6 +54,7 @@ sub BuildWine($$$$;$) my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); + rmtree "$DataDir/wine-$Build" if (!$NoRm); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not @@ -62,7 +63,6 @@ sub BuildWine($$$$;$) my $CPUCount = GetCPUCount(); $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine); system("cd '$DataDir/wine-$Build' && set -x && ". - ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". "time make -j$CPUCount"); if ($? != 0)

1 0

Francois Gouget : testbot/PatchUtils: Detect when make_fir needs to be run.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: tools Branch: master Commit: 53ac3623936a0f48554c162c8e1a2d4e81dca608 URL: https://source.winehq.org/git/tools.git/?a=commit;h=53ac3623936a0f48554c162… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:55:21 2020 +0100 testbot/PatchUtils: Detect when make_fir needs to be run. 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 | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 85df900..8a6982c 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -148,6 +148,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeFir}) + { + InfoMsg "\nRunning make_fir\n"; + system("cd '$DataDir/$Dir/dlls/dsound/' && set -x && ./make_fir"); + if ($? != 0) + { + LogMsg "make_fir failed\n"; + return undef; + } + } if ($Impacts->{MakeOpenGL}) { InfoMsg "\nRunning make_opengl\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index eaa9868..44b3f97 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/dlls/dsound/make_fir$=) + { + $Impacts->{MakeFir} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) { $Impacts->{MakeErrors} = 1;

1 0

Francois Gouget : testbot/web: Remove the old job submit page.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: tools Branch: master Commit: 7d763278df8dad54c1acd4e966e32ed4affefdac URL: https://source.winehq.org/git/tools.git/?a=commit;h=7d763278df8dad54c1acd4e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:57:00 2020 +0100 testbot/web: Remove the old job submit page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 3 +- testbot/web/OldSubmit.pl | 1043 ------------------------------- 2 files changed, 1 insertion(+), 1045 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=7d763278df8dad54c1a…

1 0

Francois Gouget : testbot/LogUtils: Handle child process crashes.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: tools Branch: master Commit: c0be1870cb2a80620939ae364049686fba924854 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c0be1870cb2a80620939ae3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 17 00:02:47 2020 +0100 testbot/LogUtils: Handle child process crashes. Make sure they are included in the failure count, highlighted as failures and sanitized before comparison for the new failures detection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48651 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 57229bc..99c30e0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -327,7 +327,7 @@ sub GetReportLineCategory($) if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or $Line =~ /Fatal: test .* does not exist/ or $Line =~ / done $258$/ or - $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or + $Line =~ /: unhandled exception [0-9a-fA-F]{8} (?:at|in) / or $Line =~ /^Unhandled exception: /) { return "error"; @@ -627,6 +627,13 @@ sub ParseWineTestReport($$$) _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) or + $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) + { + _CheckUnit($LogInfo, $Cur, $1, "child exception"); + $Cur->{LineFailures}++; + } elsif (($Cur->{Unit} ne "" and $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or $Line =~ /^([0-9a-f]+):([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) @@ -1054,6 +1061,8 @@ sub _GetLineKey($) or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ # or the process id in Wine's exc_filter() lines or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ + # or child process id + or $Line =~ s/^([_.a-z0-9]+:)\d+:( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ # The exact amount of data printed does not change the error or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/;

1 0

Jacek Caban : dbghelp: Move HANDLE-based crc32 helper to dbghelp.c.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: a5a6b0dcb65d8e3576e34d350c80f4789dcfdb7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5a6b0dcb65d8e3576e34d35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:06:10 2020 +0100 dbghelp: Move HANDLE-based crc32 helper to dbghelp.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 8 ++++---- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 18 +++--------------- dlls/dbghelp/macho_module.c | 16 ++++++++++++++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 413d89eb59..03e721f0c9 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -723,14 +723,14 @@ void WINAPI WinDbgExtensionDllInit(PWINDBG_EXTENSION_APIS lpExtensionApis, { } -DWORD calc_crc32(int fd) +DWORD calc_crc32(HANDLE handle) { BYTE buffer[8192]; DWORD crc = 0; - int len; + DWORD len; - lseek(fd, 0, SEEK_SET); - while ((len = read(fd, buffer, sizeof(buffer))) > 0) + SetFilePointer(handle, 0, 0, FILE_BEGIN); + while (ReadFile(handle, buffer, sizeof(buffer), &len, NULL) && len) crc = RtlComputeCrc32(crc, buffer, len); return crc; } diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index eea966d6b3..b143216dd0 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -588,7 +588,7 @@ extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* extern void* fetch_buffer(struct process* pcs, unsigned size) DECLSPEC_HIDDEN; extern const char* wine_dbgstr_addr(const ADDRESS64* addr) DECLSPEC_HIDDEN; extern struct cpu* cpu_find(DWORD) DECLSPEC_HIDDEN; -extern DWORD calc_crc32(int fd) DECLSPEC_HIDDEN; +extern DWORD calc_crc32(HANDLE handle) DECLSPEC_HIDDEN; typedef BOOL (*enum_modules_cb)(const WCHAR*, unsigned long addr, void* user); diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 961fece746..e0ae195cd8 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -966,18 +966,6 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table return TRUE; } -static DWORD calc_crc(HANDLE handle) -{ - BYTE buffer[8192]; - DWORD crc = 0; - DWORD len; - - SetFilePointer(handle, 0, 0, FILE_BEGIN); - while (ReadFile(handle, buffer, sizeof(buffer), &len, NULL) && len) - crc = RtlComputeCrc32(crc, buffer, len); - return crc; -} - static BOOL elf_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) { struct elf_map_file_data emfd; @@ -987,7 +975,7 @@ static BOOL elf_check_debug_link(const WCHAR* file, struct image_file_map* fmap, emfd.u.file.filename = file; if (!elf_map_file(&emfd, fmap)) return FALSE; - crc = calc_crc(fmap->u.elf.handle); + crc = calc_crc32(fmap->u.elf.handle); if (crc != link_crc) { WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", debugstr_w(file), crc, link_crc); @@ -1336,7 +1324,7 @@ BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, if (!elf_map_file(&emfd, &fmap)) return FALSE; if (base) *base = fmap.u.elf.elf_start; *size = fmap.u.elf.elf_size; - *checksum = calc_crc(fmap.u.elf.handle); + *checksum = calc_crc32(fmap.u.elf.handle); image_unmap_file(&fmap); return TRUE; } @@ -1432,7 +1420,7 @@ static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, sizeof(struct module_format) + sizeof(struct elf_module_info)); if (!modfmt) return FALSE; elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, modbase, - fmap->u.elf.elf_size, 0, calc_crc(fmap->u.elf.handle)); + fmap->u.elf.elf_size, 0, calc_crc32(fmap->u.elf.handle)); if (!elf_info->module) { HeapFree(GetProcessHeap(), 0, modfmt); diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9d4fc4e47a..5960b0dfc3 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -152,6 +152,18 @@ static char* format_uuid(const uint8_t uuid[16], char out[UUID_STRING_LEN]) return out; } +static DWORD macho_calc_crc32(int fd) +{ + BYTE buffer[8192]; + DWORD crc = 0; + int len; + + lseek(fd, 0, SEEK_SET); + while ((len = read(fd, buffer, sizeof(buffer))) > 0) + crc = RtlComputeCrc32(crc, buffer, len); + return crc; +} + /****************************************************************** * macho_calc_range * @@ -1369,7 +1381,7 @@ BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load if (!macho_map_file(pcs, name, split_segs, &fmap)) return FALSE; if (base) *base = fmap.u.macho.segs_start; *size = fmap.u.macho.segs_size; - *checksum = calc_crc32(fmap.u.macho.fd); + *checksum = macho_calc_crc32(fmap.u.macho.fd); macho_unmap_file(&fmap); return TRUE; } @@ -1484,7 +1496,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, if (!load_addr) load_addr = fmap.u.macho.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, - fmap.u.macho.segs_size, 0, calc_crc32(fmap.u.macho.fd)); + fmap.u.macho.segs_size, 0, macho_calc_crc32(fmap.u.macho.fd)); if (!macho_info->module) { HeapFree(GetProcessHeap(), 0, modfmt);

1 0

Jacek Caban : dbghelp: Support Windows paths in elf_locate_debug_link.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: e1b28a9c988ef0ff49d7254fd7ba05316f1c9b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1b28a9c988ef0ff49d7254f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:06:18 2020 +0100 dbghelp: Support Windows paths in elf_locate_debug_link. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e0ae195cd8..0d190e549c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1010,23 +1010,26 @@ static BOOL elf_locate_debug_link(struct image_file_map* fmap, const char* filen static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; const size_t globalDebugDirLen = ARRAY_SIZE(globalDebugDirW); - size_t filename_len; + size_t filename_len, path_len; WCHAR* p = NULL; WCHAR* slash; + WCHAR* slash2; struct image_file_map* fmap_link = NULL; fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); if (!fmap_link) return FALSE; filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); + path_len = strlenW(loaded_file); p = HeapAlloc(GetProcessHeap(), 0, - (globalDebugDirLen + strlenW(loaded_file) + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); + (globalDebugDirLen + path_len + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); if (!p) goto found; /* we prebuild the string with "execdir" */ strcpyW(p, loaded_file); - slash = strrchrW(p, '/'); - if (slash == NULL) slash = p; else slash++; + slash = p; + if ((slash2 = strrchrW(slash, '/'))) slash = slash2 + 1; + if ((slash2 = strrchrW(slash, '\\'))) slash = slash2 + 1; /* testing execdir/filename */ MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len);

1 0

Jacek Caban : dbghelp: Pass module struct to elf_locate_debug_link.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 5ba1c5960e716bdec9052efeb9f3ddfba3cf9e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ba1c5960e716bdec9052efe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 16 16:06:31 2020 +0100 dbghelp: Pass module struct to elf_locate_debug_link. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/elf_module.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 0d190e549c..6bfd58b917 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1004,8 +1004,7 @@ static BOOL elf_check_debug_link(const WCHAR* file, struct image_file_map* fmap, * is the global debug file directory, and execdir has been turned * into a relative path)." (from GDB manual) */ -static BOOL elf_locate_debug_link(struct image_file_map* fmap, const char* filename, - const WCHAR* loaded_file, DWORD crc) +static BOOL elf_locate_debug_link(const struct module* module, struct image_file_map* fmap, const char* filename, DWORD crc) { static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; @@ -1020,13 +1019,13 @@ static BOOL elf_locate_debug_link(struct image_file_map* fmap, const char* filen if (!fmap_link) return FALSE; filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); - path_len = strlenW(loaded_file); + path_len = strlenW(module->module.LoadedImageName); p = HeapAlloc(GetProcessHeap(), 0, (globalDebugDirLen + path_len + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); if (!p) goto found; /* we prebuild the string with "execdir" */ - strcpyW(p, loaded_file); + strcpyW(p, module->module.LoadedImageName); slash = p; if ((slash2 = strrchrW(slash, '/'))) slash = slash2 + 1; if ((slash2 = strrchrW(slash, '\\'))) slash = slash2 + 1; @@ -1190,7 +1189,7 @@ static BOOL elf_check_alternate(struct image_file_map* fmap, const struct module * 3/ CRC of the linked ELF file */ DWORD crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - ret = elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); + ret = elf_locate_debug_link(module, fmap, dbg_link, crc); if (!ret) WARN("Couldn't load linked debug file for %s\n", debugstr_w(module->module.ModuleName));

1 0

Zebediah Figura : wineqtdecoder: Fix compilation.
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: c38325109bc081e932e6386905dcd3827c1aad47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c38325109bc081e932e63869… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 14 14:10:25 2020 -0500 wineqtdecoder: Fix compilation. Partially written by Alistair Leslie-Hughes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index eaaf30acdb..41b29786cc 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -128,8 +128,6 @@ #include "qtprivate.h" #include "wineqtdecoder_classes.h" -extern CLSID CLSID_QTVDecoder; - WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder); typedef struct QTVDecoderImpl @@ -137,6 +135,8 @@ typedef struct QTVDecoderImpl struct strmbase_filter filter; CRITICAL_SECTION stream_cs; + AM_MEDIA_TYPE mt; + struct strmbase_source source; IUnknown *seeking; @@ -266,7 +266,7 @@ error: This->decodeHR = hr; } -static HRESULT WINAPI video_decoder_Receive(struct strmbase_sink *iface, IMediaSample *pSample) +static HRESULT WINAPI video_decoder_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr; @@ -504,7 +504,7 @@ static HRESULT video_decoder_source_get_media_type(struct strmbase_pin *iface, return S_OK; } -static HRESULT WINAPI video_decoder_DecideBufferSize(struct strmbase_source *iface, +static HRESULT WINAPI video_decoder_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); @@ -590,7 +590,7 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface) { - QTVDecoderImpl* This = impl_from_TransformFilter(pTransformFilter); + QTVDecoderImpl* This = impl_from_strmbase_filter(iface); if (This->decompressionSession) ICMDecompressionSessionRelease(This->decompressionSession); @@ -611,6 +611,7 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) { QTVDecoderImpl *object; HRESULT hr; + ISeekingPassThru *passthrough; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -640,6 +641,6 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Release(passthrough); TRACE("Created video decoder %p.\n", object); - *out = &object->tf.filter.IUnknown_inner; + *out = &object->filter.IUnknown_inner; return S_OK; }

1 0