From 2668c19b7feffbeb5905b05b0ac49e46c5f8871b Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 28 Oct 2015 20:21:10 +0100 Subject: [PATCH] Rebase against 79c59085b1b1f487e91c2695028dd3d1d257a468. --- ...dd-the-absolute-RPATH-when-linking-a.patch | 18 +++++----- ...helper-function-for-HeapAlloc-calls.patch} | 0 ...correct-memory-allocation-function-f.patch | 36 ------------------- ...lper-function-for-HeapReAlloc-calls.patch} | 0 ...r-function-for-remaining-HeapFree-c.patch} | 0 ...ts-Add-initial-driver-testing-framew.patch | 18 +++++----- patches/patchinstall.sh | 10 +++--- 7 files changed, 22 insertions(+), 60 deletions(-) rename patches/gdiplus-Memory_Allocation/{0002-gdiplus-Use-helper-function-for-HeapAlloc-calls.patch => 0001-gdiplus-Use-helper-function-for-HeapAlloc-calls.patch} (100%) delete mode 100644 patches/gdiplus-Memory_Allocation/0001-gdiplus-Use-the-correct-memory-allocation-function-f.patch rename patches/gdiplus-Memory_Allocation/{0003-gdiplus-Use-helper-function-for-HeapReAlloc-calls.patch => 0002-gdiplus-Use-helper-function-for-HeapReAlloc-calls.patch} (100%) rename patches/gdiplus-Memory_Allocation/{0004-gdiplus-Use-helper-function-for-remaining-HeapFree-c.patch => 0003-gdiplus-Use-helper-function-for-remaining-HeapFree-c.patch} (100%) diff --git a/patches/configure-Absolute_RPATH/0001-configure-Also-add-the-absolute-RPATH-when-linking-a.patch b/patches/configure-Absolute_RPATH/0001-configure-Also-add-the-absolute-RPATH-when-linking-a.patch index 43fd1cb1..ff9f75c1 100644 --- a/patches/configure-Absolute_RPATH/0001-configure-Also-add-the-absolute-RPATH-when-linking-a.patch +++ b/patches/configure-Absolute_RPATH/0001-configure-Also-add-the-absolute-RPATH-when-linking-a.patch @@ -1,29 +1,29 @@ -From d39d120e7b69873b864286ec574c7b5c9eb1de0d Mon Sep 17 00:00:00 2001 +From 53bf52b313245d965619802729ef59ada1806660 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 27 Aug 2014 00:31:23 +0200 Subject: configure: Also add the absolute RPATH when linking against libwine. --- - configure.ac | 4 ++-- + configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index c4066f6..1c5f156 100644 +index ff74f8d..529c209 100644 --- a/configure.ac +++ b/configure.ac -@@ -970,10 +970,10 @@ wine-installed: main.o +@@ -966,10 +966,10 @@ ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) [LDEXECFLAGS="-Wl,--export-dynamic"]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], -- [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`" -+ [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`:\$(DESTDIR)\$(libdir)" +- [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" ++ [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`:\$(DESTDIR)\${libdir}" LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"], [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib], -- [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`" -+ [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`:\$(DESTDIR)\$(libdir)" +- [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" ++ [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`:\$(DESTDIR)\${libdir}" LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])]) WINE_TRY_CFLAGS([-Wl,--enable-new-dtags], -- -1.7.9.5 +2.6.1 diff --git a/patches/gdiplus-Memory_Allocation/0002-gdiplus-Use-helper-function-for-HeapAlloc-calls.patch b/patches/gdiplus-Memory_Allocation/0001-gdiplus-Use-helper-function-for-HeapAlloc-calls.patch similarity index 100% rename from patches/gdiplus-Memory_Allocation/0002-gdiplus-Use-helper-function-for-HeapAlloc-calls.patch rename to patches/gdiplus-Memory_Allocation/0001-gdiplus-Use-helper-function-for-HeapAlloc-calls.patch diff --git a/patches/gdiplus-Memory_Allocation/0001-gdiplus-Use-the-correct-memory-allocation-function-f.patch b/patches/gdiplus-Memory_Allocation/0001-gdiplus-Use-the-correct-memory-allocation-function-f.patch deleted file mode 100644 index cd849bc6..00000000 --- a/patches/gdiplus-Memory_Allocation/0001-gdiplus-Use-the-correct-memory-allocation-function-f.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2a6a4f79c1d443bd7e26cd98f5be47cbde54c1a8 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Wed, 21 Oct 2015 00:52:51 +0200 -Subject: gdiplus: Use the correct memory allocation function for PropVariants. - -Signed-off-by: Sebastian Lackner -Signed-off-by: Dmitry Timoshkov ---- - dlls/gdiplus/image.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c -index 0a8027a..06cf633 100644 ---- a/dlls/gdiplus/image.c -+++ b/dlls/gdiplus/image.c -@@ -3065,7 +3065,7 @@ static BOOL get_bool_property(IWICMetadataReader *reader, const GUID *guid, cons - PropVariantInit(&value); - - id.vt = VT_LPWSTR; -- id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); -+ id.u.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); - if (!id.u.pwszVal) return FALSE; - lstrcpyW(id.u.pwszVal, prop_name); - hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); -@@ -3092,7 +3092,7 @@ static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, - PropVariantInit(&value); - - id.vt = VT_LPWSTR; -- id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); -+ id.u.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); - if (!id.u.pwszVal) return NULL; - lstrcpyW(id.u.pwszVal, prop_name); - hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); --- -2.6.1 - diff --git a/patches/gdiplus-Memory_Allocation/0003-gdiplus-Use-helper-function-for-HeapReAlloc-calls.patch b/patches/gdiplus-Memory_Allocation/0002-gdiplus-Use-helper-function-for-HeapReAlloc-calls.patch similarity index 100% rename from patches/gdiplus-Memory_Allocation/0003-gdiplus-Use-helper-function-for-HeapReAlloc-calls.patch rename to patches/gdiplus-Memory_Allocation/0002-gdiplus-Use-helper-function-for-HeapReAlloc-calls.patch diff --git a/patches/gdiplus-Memory_Allocation/0004-gdiplus-Use-helper-function-for-remaining-HeapFree-c.patch b/patches/gdiplus-Memory_Allocation/0003-gdiplus-Use-helper-function-for-remaining-HeapFree-c.patch similarity index 100% rename from patches/gdiplus-Memory_Allocation/0004-gdiplus-Use-helper-function-for-remaining-HeapFree-c.patch rename to patches/gdiplus-Memory_Allocation/0003-gdiplus-Use-helper-function-for-remaining-HeapFree-c.patch diff --git a/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch b/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch index 1ffa5731..a673ab70 100644 --- a/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch +++ b/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch @@ -1,4 +1,4 @@ -From e707326e017a60d1178b1f07d2c0178f64b01e30 Mon Sep 17 00:00:00 2001 +From c7174bf7d94ae8d6cd82a6ea02d7161bb2f936f8 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 18 Jan 2015 05:42:10 +0100 Subject: ntoskrnl.exe/tests: Add initial driver testing framework and @@ -553,7 +553,7 @@ index 069d0ae..b1d77ab 100755 { die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; diff --git a/tools/makedep.c b/tools/makedep.c -index 8c5abde..62bd284 100644 +index 295e5e8..89af38d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -165,4 +165,5 @@ struct makefile @@ -598,10 +598,10 @@ index 8c5abde..62bd284 100644 struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; + struct strarray resource_dlls = get_expanded_make_var_array( make, "RC_DLLS" ); + char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" ); + char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" ); - for (i = 0; i < linguas.count; i++) - strarray_add( &mo_files, strmake( "%s/%s.mo", top_obj_dir_path( make, "po" ), linguas.str[i] )); -@@ -2012,7 +2038,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t +@@ -2014,7 +2040,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t } else { @@ -610,7 +610,7 @@ index 8c5abde..62bd284 100644 (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib); -@@ -2026,7 +2052,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t +@@ -2028,7 +2054,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); @@ -619,7 +619,7 @@ index 8c5abde..62bd284 100644 { output_filenames( dll_flags ); if (make->use_msvcrt) output_filenames( msvcrt_flags ); -@@ -2106,6 +2132,72 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t +@@ -2108,6 +2134,72 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t output( "\n" ); } @@ -692,7 +692,7 @@ index 8c5abde..62bd284 100644 if (make->module && !make->staticlib) { struct strarray all_libs = empty_strarray; -@@ -2387,6 +2479,83 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t +@@ -2411,6 +2503,83 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strarray_add( &all_targets, program ); } @@ -776,7 +776,7 @@ index 8c5abde..62bd284 100644 if (all_targets.count) { output( "all:" ); -@@ -2668,4 +2837,5 @@ static void update_makefile( const char *path ) +@@ -2692,4 +2861,5 @@ static void update_makefile( const char *path ) make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); + make->resource = get_expanded_make_variable( make, "RESOURCE" ); diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 922f0225..0e3e44f7 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "28b916b26eceb35a071e9aad76da1fbbaa857ba1" + echo "79c59085b1b1f487e91c2695028dd3d1d257a468" } # Show version information @@ -3192,12 +3192,10 @@ fi # | dlls/gdiplus/stringformat.c # | if test "$enable_gdiplus_Memory_Allocation" -eq 1; then - patch_apply gdiplus-Memory_Allocation/0001-gdiplus-Use-the-correct-memory-allocation-function-f.patch - patch_apply gdiplus-Memory_Allocation/0002-gdiplus-Use-helper-function-for-HeapAlloc-calls.patch - patch_apply gdiplus-Memory_Allocation/0003-gdiplus-Use-helper-function-for-HeapReAlloc-calls.patch - patch_apply gdiplus-Memory_Allocation/0004-gdiplus-Use-helper-function-for-remaining-HeapFree-c.patch + patch_apply gdiplus-Memory_Allocation/0001-gdiplus-Use-helper-function-for-HeapAlloc-calls.patch + patch_apply gdiplus-Memory_Allocation/0002-gdiplus-Use-helper-function-for-HeapReAlloc-calls.patch + patch_apply gdiplus-Memory_Allocation/0003-gdiplus-Use-helper-function-for-remaining-HeapFree-c.patch ( - echo '+ { "Sebastian Lackner", "gdiplus: Use the correct memory allocation function for PropVariants.", 1 },'; echo '+ { "Sebastian Lackner", "gdiplus: Use helper function for HeapAlloc calls.", 1 },'; echo '+ { "Sebastian Lackner", "gdiplus: Use helper function for HeapReAlloc calls.", 1 },'; echo '+ { "Sebastian Lackner", "gdiplus: Use helper function for remaining HeapFree calls.", 1 },';