Added patch to implement stubs for MFStartup and MFShutdown.

This commit is contained in:
Sebastian Lackner 2014-12-12 00:58:54 +01:00
parent 50db62e9f4
commit 88e30c29c4
3 changed files with 18 additions and 2 deletions

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ wine-compholio (1.7.33) UNRELEASED; urgency=low
* Added patch to implement shlwapi.StrCatChainW.
* Added patch to allow Accept-Encoding for HTTP/1.0 in wininet.
* Added patch for combase HSTRING objects.
* Added patch to implement stubs for MFStartup and MFShutdown.
* Removed patch to fix copy and paste errors in ws2_32 tests (accepted upstream).
* Removed patch to fix ordering of IP addresses by metric if two addresses have the same metric (accepted upstream).
* Removed patch to reset data->pWintrustData->u.pFile->hFile after closing handle (accepted upstream).

View File

@ -559,7 +559,7 @@ def generate_makefile(all_patches):
# Generate dependencies and code to apply patches
fp.write(".INTERMEDIATE: %s.ok\n" % patch.name)
depends = " ".join([""] + ["%s.ok" % all_patches[d].name for d in patch.depends]) if len(patch.depends) else ""
depends = " ".join([""] + sorted(["%s.ok" % all_patches[d].name for d in patch.depends])) if len(patch.depends) else ""
fp.write("%s.ok:%s\n" % (patch.name, depends))
for f in patch.files:
fp.write("\t$(call APPLY_FILE,%s)\n" % os.path.join(patch.name, f))

View File

@ -55,6 +55,7 @@ PATCHLIST := \
kernel32-VerifyVersionInfo.ok \
libs-Unicode_Collation.ok \
libwine-BSD_mmap_fixed.ok \
mfplat-Stubs.ok \
msvcp90-basic_string_wchar_dtor.ok \
msvcrt-atof_strtod.ok \
ntdll-DOS_Attributes.ok \
@ -764,6 +765,20 @@ libwine-BSD_mmap_fixed.ok:
echo '+ { "André Hentschel", "libwine: Use try_mmap_fixed for wine64 on FreeBSD.", 1 },'; \
) > libwine-BSD_mmap_fixed.ok
# Patchset mfplat-Stubs
# |
# | Modified files:
# | * dlls/mfplat/main.c, dlls/mfplat/mfplat.spec, include/Makefile.in, include/mferror.h
# |
.INTERMEDIATE: mfplat-Stubs.ok
mfplat-Stubs.ok:
$(call APPLY_FILE,mfplat-Stubs/0001-include-Add-mferror.h-header.patch)
$(call APPLY_FILE,mfplat-Stubs/0002-mfplat-Implement-stubs-for-MFStartup-and-MFShutdown.patch)
@( \
echo '+ { "Sebastian Lackner", "include: Add mferror.h header.", 1 },'; \
echo '+ { "Sebastian Lackner", "mfplat: Implement stubs for MFStartup and MFShutdown.", 1 },'; \
) > mfplat-Stubs.ok
# Patchset mshtml-sessionStorage
# |
# | Modified files:
@ -954,7 +969,7 @@ ntdll-Heap_FreeLists.ok:
# | include/ntifs.h
# |
.INTERMEDIATE: ntdll-Junction_Points.ok
ntdll-Junction_Points.ok: ntdll-Fix_Free.ok ntdll-DOS_Attributes.ok
ntdll-Junction_Points.ok: ntdll-DOS_Attributes.ok ntdll-Fix_Free.ok
$(call APPLY_FILE,ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch)
$(call APPLY_FILE,ntdll-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch)
$(call APPLY_FILE,ntdll-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch)