diff --git a/patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch b/patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch index fb8bb04f..d03627a0 100644 --- a/patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch +++ b/patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch @@ -1,8 +1,8 @@ -From d269fc1d62c4e26df5959b728266ae3295501db3 Mon Sep 17 00:00:00 2001 +From ace9fff7d9de39029e09591cec4cce39631baa53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 6 Aug 2017 03:15:34 +0200 -Subject: [PATCH] programs/runas: Basic implementation for starting processes - with a different trustlevel. +Subject: [PATCH] programs/runas: Basic implementation for starting + processes with a different trustlevel. --- configure.ac | 1 + @@ -17,17 +17,17 @@ Subject: [PATCH] programs/runas: Basic implementation for starting processes create mode 100644 programs/runas/runas.rc diff --git a/configure.ac b/configure.ac -index 2996010..aea102b 100644 +index 7b796ef..6f63217 100644 --- a/configure.ac +++ b/configure.ac -@@ -3823,6 +3823,7 @@ WINE_CONFIG_TEST(programs/regedit/tests) - WINE_CONFIG_PROGRAM(regsvcs,,[install]) - WINE_CONFIG_PROGRAM(regsvr32,,[install,installbin,manpage]) - WINE_CONFIG_PROGRAM(rpcss,,[install]) +@@ -3836,6 +3836,7 @@ WINE_CONFIG_PROGRAM(regsvr32) + WINE_CONFIG_PROGRAM(rpcss) + WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16) + WINE_CONFIG_PROGRAM(rundll32) +WINE_CONFIG_PROGRAM(runas,,[install]) - WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install]) - WINE_CONFIG_PROGRAM(rundll32,,[install]) - WINE_CONFIG_PROGRAM(sc,,[install]) + WINE_CONFIG_PROGRAM(sc) + WINE_CONFIG_PROGRAM(schtasks) + WINE_CONFIG_TEST(programs/schtasks/tests) diff --git a/programs/runas/Makefile.in b/programs/runas/Makefile.in new file mode 100644 index 0000000..be9434b @@ -340,5 +340,5 @@ index 0000000..f9297a4 + %2!u!: %3\n" +} -- -2.7.4 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch b/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch index 860fd24a..78e436fc 100644 --- a/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch +++ b/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch @@ -1,4 +1,4 @@ -From 7e17dfac73025ee2a51c2791c412abe47b36677c Mon Sep 17 00:00:00 2001 +From 0f81943e8bdac5e3917e937bc4cb4215227c544d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 01:11:46 +0100 Subject: [PATCH] iertutil: Add dll and add stub for ordinal 811. @@ -14,19 +14,19 @@ Subject: [PATCH] iertutil: Add dll and add stub for ordinal 811. create mode 100644 dlls/iertutil/main.c diff --git a/configure.ac b/configure.ac -index 4051d50..a5c5a96 100644 +index 6f63217..fd0c99d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3263,7 +3263,8 @@ WINE_CONFIG_DLL(iccvid) +@@ -3274,7 +3274,8 @@ WINE_CONFIG_DLL(iccvid) WINE_CONFIG_DLL(icmp) - WINE_CONFIG_DLL(ieframe,,[implib]) + WINE_CONFIG_DLL(ieframe) WINE_CONFIG_TEST(dlls/ieframe/tests) -WINE_CONFIG_DLL(ieproxy) +WINE_CONFIG_DLL(ieproxy,,[clean]) +WINE_CONFIG_DLL(iertutil) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) WINE_CONFIG_DLL(imaadp32.acm) - WINE_CONFIG_DLL(imagehlp,,[implib]) + WINE_CONFIG_DLL(imagehlp) diff --git a/dlls/iertutil/Makefile.in b/dlls/iertutil/Makefile.in new file mode 100644 index 0000000..268026e diff --git a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch index 7a1ddd72..dd3ff2ae 100644 --- a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch +++ b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch @@ -1,34 +1,36 @@ -From 3981c1e27bd2b871761ad5a627c99e0fca17a8ac Mon Sep 17 00:00:00 2001 +From cdc37e086bd04654655663b9408640a0b484f999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 17:07:35 +0100 -Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for - XamlBehaviorEnabled. +Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub + for XamlBehaviorEnabled. --- - configure.ac | 1 + + configure.ac | 3 +- dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in | 4 +++ .../ext-ms-win-xaml-pal-l1-1-0.spec | 6 ++++ dlls/ext-ms-win-xaml-pal-l1-1-0/main.c | 35 ++++++++++++++++++++++ - 4 files changed, 46 insertions(+) + 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c diff --git a/configure.ac b/configure.ac -index 8bd76710a37..1f78aea5ce0 100644 +index a011d82..ba0fcb4 100644 --- a/configure.ac +++ b/configure.ac -@@ -3114,6 +3114,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) +@@ -3241,7 +3241,8 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0) +-WINE_CONFIG_DLL(faultrep) +WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0) - WINE_CONFIG_DLL(faultrep,,[implib]) ++WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) + WINE_CONFIG_DLL(fltmgr.sys) diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in new file mode 100644 -index 00000000000..6382d85272b +index 0000000..6382d85 --- /dev/null +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in @@ -0,0 +1,4 @@ @@ -38,7 +40,7 @@ index 00000000000..6382d85272b + main.c diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec new file mode 100644 -index 00000000000..c167f5e753e +index 0000000..c167f5e --- /dev/null +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec @@ -0,0 +1,6 @@ @@ -50,7 +52,7 @@ index 00000000000..c167f5e753e +@ stub XamlPalUninitialize diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c new file mode 100644 -index 00000000000..3e282758f41 +index 0000000..3e28275 --- /dev/null +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c @@ -0,0 +1,35 @@ @@ -90,5 +92,5 @@ index 00000000000..3e282758f41 + return TRUE; +} -- -2.13.1 +1.9.1 diff --git a/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch b/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch index cf0965a5..e1bfa823 100644 --- a/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch +++ b/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch @@ -1,8 +1,8 @@ -From 94dc68ec5e72106364d20829ab1ab11e98fa7320 Mon Sep 17 00:00:00 2001 +From a1932246122fadf7ade2bf258cf06fea30366523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 22 Feb 2015 01:25:20 +0100 -Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using vaapi - backend. +Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder + using vaapi backend. --- configure.ac | 18 +- @@ -22,10 +22,10 @@ Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using vaapi create mode 100644 dlls/dxva2/vaapi.c diff --git a/configure.ac b/configure.ac -index 9163f71..9d5929d 100644 +index bf04f97..7954a73 100644 --- a/configure.ac +++ b/configure.ac -@@ -106,6 +106,8 @@ AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide +@@ -107,6 +107,8 @@ AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]), [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi]) @@ -34,7 +34,7 @@ index 9163f71..9d5929d 100644 AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) -@@ -1209,6 +1211,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c +@@ -1210,6 +1212,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg OpenGL and Direct3D won't be supported.]) @@ -55,8 +55,8 @@ index 9163f71..9d5929d 100644 CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3208,7 +3224,7 @@ WINE_CONFIG_LIB(dxerr9) - WINE_CONFIG_DLL(dxgi,,[implib]) +@@ -3219,7 +3235,7 @@ WINE_CONFIG_LIB(dxerr9) + WINE_CONFIG_DLL(dxgi) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) -WINE_CONFIG_DLL(dxva2) diff --git a/patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch b/patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch index 81d6e359..2c0f50a6 100644 --- a/patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch +++ b/patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch @@ -1,8 +1,8 @@ -From ee8847e54b1afeefbb21e3c1ce0e8c40cbf34cc0 Mon Sep 17 00:00:00 2001 +From a29f857073158478574f12119d8e99382d54ebeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 1 Apr 2016 01:29:51 +0200 -Subject: [PATCH] fsutil: Add fsutil program with support for creating hard - links. +Subject: [PATCH] fsutil: Add fsutil program with support for + creating hard links. --- configure.ac | 2 +- @@ -15,18 +15,18 @@ Subject: [PATCH] fsutil: Add fsutil program with support for creating hard create mode 100644 programs/fsutil/resources.h diff --git a/configure.ac b/configure.ac -index 6baf58b..1b41c90 100644 +index 187d1dc..1559d4d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3825,7 +3825,7 @@ WINE_CONFIG_PROGRAM(expand,,[install]) - WINE_CONFIG_PROGRAM(explorer,,[install]) - WINE_CONFIG_PROGRAM(extrac32,,[install]) - WINE_CONFIG_PROGRAM(findstr,,[install]) --WINE_CONFIG_PROGRAM(fsutil,,[install]) +@@ -3836,7 +3836,7 @@ WINE_CONFIG_PROGRAM(expand) + WINE_CONFIG_PROGRAM(explorer) + WINE_CONFIG_PROGRAM(extrac32) + WINE_CONFIG_PROGRAM(findstr) +-WINE_CONFIG_PROGRAM(fsutil) +WINE_CONFIG_PROGRAM(fsutil,,[clean,install]) - WINE_CONFIG_PROGRAM(hh,,[install]) - WINE_CONFIG_PROGRAM(hostname,,[install]) - WINE_CONFIG_PROGRAM(icacls,,[install]) + WINE_CONFIG_PROGRAM(hh) + WINE_CONFIG_PROGRAM(hostname) + WINE_CONFIG_PROGRAM(icacls) diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index f339c4c..7433695 100644 --- a/programs/fsutil/Makefile.in diff --git a/patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch b/patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch index 64b9a227..9acda715 100644 --- a/patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch +++ b/patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch @@ -1,4 +1,4 @@ -From 33fb892671a02207304145a987bb02885fb6b6b2 Mon Sep 17 00:00:00 2001 +From 2d1834fcb5993b569fa1fb6edc0c6e782b4cd385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 16 Aug 2017 02:45:23 +0200 Subject: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx. @@ -19,18 +19,18 @@ Subject: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx. create mode 100644 include/pathcch.h diff --git a/configure.ac b/configure.ac -index 1b41c90..6621815 100644 +index 1559d4d..cd79406 100644 --- a/configure.ac +++ b/configure.ac -@@ -3329,7 +3329,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests) +@@ -3340,7 +3340,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests) WINE_CONFIG_DLL(kerberos) - WINE_CONFIG_DLL(kernel32,,[implib]) + WINE_CONFIG_DLL(kernel32) WINE_CONFIG_TEST(dlls/kernel32/tests) -WINE_CONFIG_DLL(kernelbase) +WINE_CONFIG_DLL(kernelbase,,[implib]) +WINE_CONFIG_TEST(dlls/kernelbase/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) - WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel]) + WINE_CONFIG_DLL(krnl386.exe16,enable_win16) WINE_CONFIG_DLL(ksuser) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index cb10d89..4df147e 100644 diff --git a/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch b/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch index e78af9d6..44c9de13 100644 --- a/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch +++ b/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch @@ -1,7 +1,8 @@ -From b252ccdcbb84f5aef2d83b1324598b93b6ac2bba Mon Sep 17 00:00:00 2001 +From a2444d61bf9783943ce1d8e7e4a1eb7fe7f36e04 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Tue, 15 Sep 2015 17:44:33 -0600 -Subject: [PATCH] msidb: Add stub tool for manipulating MSI databases. +Subject: [PATCH] msidb: Add stub tool for manipulating MSI + databases. Signed-off-by: Erich E. Hoover --- @@ -13,17 +14,17 @@ Signed-off-by: Erich E. Hoover create mode 100644 programs/msidb/main.c diff --git a/configure.ac b/configure.ac -index e1a20cc..6f61b42 100644 +index 6e9f9c9..af61142 100644 --- a/configure.ac +++ b/configure.ac -@@ -3855,6 +3855,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install]) - WINE_CONFIG_PROGRAM(lodctr,,[install]) - WINE_CONFIG_PROGRAM(mofcomp,,[install]) - WINE_CONFIG_PROGRAM(mshta,,[install]) +@@ -3866,6 +3866,7 @@ WINE_CONFIG_PROGRAM(ipconfig) + WINE_CONFIG_PROGRAM(lodctr) + WINE_CONFIG_PROGRAM(mofcomp) + WINE_CONFIG_PROGRAM(mshta) +WINE_CONFIG_PROGRAM(msidb,,[install,installbin]) - WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage]) - WINE_CONFIG_PROGRAM(msinfo32,,[install]) - WINE_CONFIG_PROGRAM(net,,[install]) + WINE_CONFIG_PROGRAM(msiexec) + WINE_CONFIG_PROGRAM(msinfo32) + WINE_CONFIG_PROGRAM(net) diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in new file mode 100644 index 0000000..dae699c diff --git a/patches/msxml3-Normalize_Data/0001-msxml3-Remove-CRs-in-domtext_put_data-and-add-them-i.patch b/patches/msxml3-Normalize_Data/0001-msxml3-Remove-CRs-in-domtext_put_data-and-add-them-i.patch deleted file mode 100644 index 295baebe..00000000 --- a/patches/msxml3-Normalize_Data/0001-msxml3-Remove-CRs-in-domtext_put_data-and-add-them-i.patch +++ /dev/null @@ -1,254 +0,0 @@ -From bc46a946ab92c5a9e045dec1eb4298fa0de3d438 Mon Sep 17 00:00:00 2001 -From: Alex Henrie -Date: Fri, 25 Aug 2017 09:05:27 -0600 -Subject: msxml3: Remove CRs in domtext_put_data and add them in - domtext_get_xml. - -Fixes https://bugs.winehq.org/show_bug.cgi?id=42468 - -Signed-off-by: Alex Henrie ---- - dlls/msxml3/tests/domdoc.c | 153 +++++++++++++++++++++++++++++++++++++++------ - dlls/msxml3/text.c | 36 ++++++++--- - 2 files changed, 163 insertions(+), 26 deletions(-) - -diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c -index fa10a365f55..eea8f624a9b 100644 ---- a/dlls/msxml3/tests/domdoc.c -+++ b/dlls/msxml3/tests/domdoc.c -@@ -12099,34 +12099,148 @@ static void test_put_data(void) - type++; - } - -- /* \r\n sequence is never escaped */ -+ IXMLDOMDocument_Release(doc); -+ free_bstrs(); -+} -+ -+static void test_newline_normalization(void) -+{ -+ const struct msxmlsupported_data_t *table = domdoc_support_data; -+ IXMLDOMDocument *doc; -+ IXMLDOMText *text; -+ IXMLDOMNode *node; -+ VARIANT v; -+ VARIANT_BOOL b; -+ BSTR s; -+ HRESULT hr; -+ LONG length; -+ - V_VT(&v) = VT_I2; - V_I2(&v) = NODE_TEXT; - -- hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); -- ok(hr == S_OK, "got 0x%08x\n", hr); -+ while (table->clsid) -+ { -+ if (!is_clsid_supported(table->clsid, &IID_IXMLDOMDocument)) -+ { -+ table++; -+ continue; -+ } - -- IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); -+ hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); -+ ok(hr == S_OK, "got 0x%08x\n", hr); - -- hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); -- ok(hr == S_OK, "got 0x%08x\n", hr); -+ hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); -+ ok(hr == S_OK, "got 0x%08x\n", hr); - -- hr = IXMLDOMText_get_data(text, &get_data); -- ok(hr == S_OK, "got 0x%08x\n", hr); --todo_wine -- ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); -- SysFreeString(get_data); -+ IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); - -- hr = IXMLDOMText_get_xml(text, &get_data); -- ok(hr == S_OK, "got 0x%08x\n", hr); -- ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); -- SysFreeString(get_data); -+ /* \r\n is normalized to \n and back to \r\n */ - -- IXMLDOMText_Release(text); -- IXMLDOMNode_Release(node); -+ hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); -+ ok(hr == S_OK, "got 0x%08x\n", hr); - -- IXMLDOMDocument_Release(doc); -- free_bstrs(); -+ hr = IXMLDOMText_get_data(text, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ hr = IXMLDOMText_get_length(text, &length); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(length == 1, "got %d, expected 1\n", length); -+ -+ hr = IXMLDOMText_get_xml(text, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ -+ -+ hr = IXMLDOMText_put_data(text, _bstr_("\r\r\n")); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ -+ hr = IXMLDOMText_get_data(text, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ hr = IXMLDOMText_get_length(text, &length); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(length == 2, "got %d, expected 2\n", length); -+ -+ hr = IXMLDOMText_get_xml(text, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ /* the same normalizations are applied when loading a document as a whole */ -+ -+ hr = IXMLDOMDocument_loadXML(doc, _bstr_("foo\n\r\n\r\r\nbar"), &b); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ -+ hr = IXMLDOMDocument_get_text(doc, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ hr = IXMLDOMDocument_get_xml(doc, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("\r\nfoo\r\n\r\n\r\n\r\nbar\r\n")), -+ "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ /* even if xml:space="preserve" */ -+ -+ hr = IXMLDOMDocument_loadXML(doc, _bstr_("" -+ "foo\n\r\n\r\r\nbar"), &b); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ -+ hr = IXMLDOMDocument_get_text(doc, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ hr = IXMLDOMDocument_get_xml(doc, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("\r\n" -+ "foo\r\n\r\n\r\n\r\nbar\r\n")), -+ "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ /* or preserveWhiteSpace is set */ -+ -+ hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ -+ hr = IXMLDOMDocument_loadXML(doc, _bstr_("foo\n\r\n\r\r\nbar"), &b); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ -+ hr = IXMLDOMDocument_get_text(doc, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); -+ SysFreeString(s); -+ -+ hr = IXMLDOMDocument_get_xml(doc, &s); -+ ok(hr == S_OK, "got 0x%08x\n", hr); -+ if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) -+ { -+ /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ -+todo_wine -+ ok(!lstrcmpW(s, _bstr_("foo\r\n\r\n\r\n\r\nbar")), -+ "got %s\n", wine_dbgstr_w(s)); -+ } -+ else -+ { -+ ok(!lstrcmpW(s, _bstr_("\r\nfoo\r\n\r\n\r\n\r\nbar\r\n")), -+ "got %s\n", wine_dbgstr_w(s)); -+ } -+ SysFreeString(s); -+ -+ IXMLDOMText_Release(text); -+ IXMLDOMNode_Release(node); -+ IXMLDOMDocument_Release(doc); -+ free_bstrs(); -+ table++; -+ } - } - - static void test_putref_schemas(void) -@@ -12635,6 +12749,7 @@ START_TEST(domdoc) - test_nodeValue(); - test_get_namespaces(); - test_put_data(); -+ test_newline_normalization(); - test_putref_schemas(); - test_namedmap_newenum(); - test_xmlns_attribute(); -diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c -index 3a12d4bf622..e16d53a3f43 100644 ---- a/dlls/msxml3/text.c -+++ b/dlls/msxml3/text.c -@@ -522,7 +522,7 @@ static HRESULT WINAPI domtext_get_xml( - - TRACE("(%p)->(%p)\n", This, p); - -- return node_get_xml(&This->node, FALSE, p); -+ return node_get_xml(&This->node, TRUE, p); - } - - static HRESULT WINAPI domtext_transformNode( -@@ -616,15 +616,37 @@ static HRESULT WINAPI domtext_put_data( - BSTR data) - { - domtext *This = impl_from_IXMLDOMText( iface ); -- static const WCHAR rnW[] = {'\r','\n',0}; -+ BSTR normalized_data = NULL; -+ HRESULT hr; -+ size_t i, j; - - TRACE("(%p)->(%s)\n", This, debugstr_w(data)); - -- if (data && !strcmpW(rnW, data)) -- This->node.node->name = xmlStringTextNoenc; -- else -- domtext_reset_noenc(This); -- return node_set_content(&This->node, data); -+ if (data) -+ { -+ /* normalize line endings */ -+ normalized_data = SysAllocStringLen(NULL, SysStringLen(data)); -+ if (!normalized_data) return E_OUTOFMEMORY; -+ for (i = 0, j = 0; data[i]; i++) -+ { -+ if (data[i] == '\r') -+ { -+ if (data[i + 1] == '\n') i++; -+ normalized_data[j++] = '\n'; -+ } -+ else -+ { -+ normalized_data[j++] = data[i]; -+ } -+ } -+ normalized_data[j] = 0; -+ } -+ -+ domtext_reset_noenc(This); -+ hr = node_set_content(&This->node, normalized_data); -+ -+ SysFreeString(normalized_data); -+ return hr; - } - - static HRESULT WINAPI domtext_get_length( --- -2.14.1 - diff --git a/patches/msxml3-Normalize_Data/definition b/patches/msxml3-Normalize_Data/definition deleted file mode 100644 index daf2b505..00000000 --- a/patches/msxml3-Normalize_Data/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [42468] Remove CRs in domtext_put_data and add them in domtext_get_xml diff --git a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch index 8c56d84f..19515033 100644 --- a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch +++ b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch @@ -1,4 +1,4 @@ -From 05c9bc5495e04fc20d4a06efc4966f3d926e6468 Mon Sep 17 00:00:00 2001 +From 75d82d2ec02b8cef45c942e677824e5df4ddf135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 5 Jan 2015 18:11:53 +0100 Subject: [PATCH] nvapi: First implementation. @@ -25,10 +25,10 @@ Subject: [PATCH] nvapi: First implementation. create mode 100644 include/nvapi.h diff --git a/configure.ac b/configure.ac -index 38b4e3e..1083cb1 100644 +index 87c507a..ce47cd0 100644 --- a/configure.ac +++ b/configure.ac -@@ -214,6 +214,12 @@ esac +@@ -215,6 +215,12 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} @@ -41,8 +41,8 @@ index 38b4e3e..1083cb1 100644 dnl Disable winetest too if tests are disabled enable_winetest=${enable_winetest:-$enable_tests} -@@ -3535,6 +3541,9 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests) - WINE_CONFIG_DLL(ntoskrnl.exe,,[implib],[ntoskrnl]) +@@ -3543,6 +3549,9 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests) + WINE_CONFIG_DLL(ntoskrnl.exe) WINE_CONFIG_DLL(ntprint) WINE_CONFIG_TEST(dlls/ntprint/tests) +WINE_CONFIG_DLL(nvapi,enable_win32) @@ -50,7 +50,7 @@ index 38b4e3e..1083cb1 100644 +WINE_CONFIG_DLL(nvapi64,enable_win64) WINE_CONFIG_DLL(nvcuda) WINE_CONFIG_TEST(dlls/nvcuda/tests) - WINE_CONFIG_DLL(objsel,,[clean]) + WINE_CONFIG_DLL(objsel) diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in new file mode 100644 index 0000000..606177f diff --git a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch index 5bad9f84..6818d296 100644 --- a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch +++ b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch @@ -1,34 +1,32 @@ -From d08b2a4d6860db1cf9a7b3e5b7e2b7b1615783c3 Mon Sep 17 00:00:00 2001 +From a62cf17f8a528ee62f75b2873d8d122f3259f4f2 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 3 Jan 2015 03:32:12 +0100 Subject: [PATCH] nvcuda: Add stub dll. --- - configure.ac | 3 +- + configure.ac | 1 + dlls/nvcuda/Makefile.in | 6 + dlls/nvcuda/nvcuda.c | 37 ++++++ dlls/nvcuda/nvcuda.rc | 33 ++++++ dlls/nvcuda/nvcuda.spec | 308 ++++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 386 insertions(+), 1 deletion(-) + 5 files changed, 385 insertions(+) create mode 100644 dlls/nvcuda/Makefile.in create mode 100644 dlls/nvcuda/nvcuda.c create mode 100644 dlls/nvcuda/nvcuda.rc create mode 100644 dlls/nvcuda/nvcuda.spec diff --git a/configure.ac b/configure.ac -index 197d1e6..a49c31a 100644 +index 91b3bdc..5da26eb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3534,7 +3534,8 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests) - WINE_CONFIG_DLL(ntoskrnl.exe,,[implib],[ntoskrnl]) +@@ -3543,6 +3543,7 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests) + WINE_CONFIG_DLL(ntoskrnl.exe) WINE_CONFIG_DLL(ntprint) WINE_CONFIG_TEST(dlls/ntprint/tests) --WINE_CONFIG_DLL(objsel) +WINE_CONFIG_DLL(nvcuda) -+WINE_CONFIG_DLL(objsel,,[clean]) - WINE_CONFIG_DLL(odbc32,,[implib]) - WINE_CONFIG_DLL(odbccp32,,[implib]) - WINE_CONFIG_TEST(dlls/odbccp32/tests) + WINE_CONFIG_DLL(objsel) + WINE_CONFIG_DLL(odbc32) + WINE_CONFIG_DLL(odbccp32) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in new file mode 100644 index 0000000..4b33278 diff --git a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch index 848308ea..686312ab 100644 --- a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch +++ b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch @@ -1,7 +1,7 @@ -From 2cda99ddf587014177b89227e5e13763d0e58ae6 Mon Sep 17 00:00:00 2001 +From 78410816ed0347b61eccf018ab738e45cfc083ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 3 Jan 2015 03:39:11 +0100 -Subject: nvcuda: First implementation. (rev 2) +Subject: [PATCH] nvcuda: First implementation. (rev 2) Changes by Sebastian Lackner : * Add static to a couple of functions @@ -23,19 +23,19 @@ Changes by Sebastian Lackner : create mode 100644 dlls/nvcuda/tests/nvcuda.c diff --git a/configure.ac b/configure.ac -index 1e38434..8a98996 100644 +index 5da26eb..87c507a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3158,6 +3158,7 @@ WINE_CONFIG_DLL(ntprint) +@@ -3544,6 +3544,7 @@ WINE_CONFIG_DLL(ntoskrnl.exe) WINE_CONFIG_DLL(ntprint) WINE_CONFIG_TEST(dlls/ntprint/tests) WINE_CONFIG_DLL(nvcuda) +WINE_CONFIG_TEST(dlls/nvcuda/tests) - WINE_CONFIG_DLL(objsel,,[clean]) - WINE_CONFIG_DLL(odbc32,,[implib]) - WINE_CONFIG_DLL(odbccp32,,[implib]) + WINE_CONFIG_DLL(objsel) + WINE_CONFIG_DLL(odbc32) + WINE_CONFIG_DLL(odbccp32) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in -index 4b33278c115..0921ce64cae 100644 +index 4b33278..0921ce6 100644 --- a/dlls/nvcuda/Makefile.in +++ b/dlls/nvcuda/Makefile.in @@ -1,6 +1,7 @@ @@ -48,7 +48,7 @@ index 4b33278c115..0921ce64cae 100644 RC_SRCS = nvcuda.rc diff --git a/dlls/nvcuda/internal.c b/dlls/nvcuda/internal.c new file mode 100644 -index 00000000000..611e3108d0b +index 0000000..611e310 --- /dev/null +++ b/dlls/nvcuda/internal.c @@ -0,0 +1,515 @@ @@ -568,7 +568,7 @@ index 00000000000..611e3108d0b + return CUDA_ERROR_UNKNOWN; +} diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index 8b7eb9c37b0..3ef7c35059d 100644 +index 8b7eb9c..3ef7c35 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c @@ -1,4 +1,5 @@ @@ -2690,7 +2690,7 @@ index 8b7eb9c37b0..3ef7c35059d 100644 diff --git a/dlls/nvcuda/nvcuda.h b/dlls/nvcuda/nvcuda.h new file mode 100644 -index 00000000000..aaffe13af5f +index 0000000..aaffe13 --- /dev/null +++ b/dlls/nvcuda/nvcuda.h @@ -0,0 +1,29 @@ @@ -2724,7 +2724,7 @@ index 00000000000..aaffe13af5f + +#endif diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec -index 279f7ab803b..621b8d59cf0 100644 +index 279f7ab..621b8d5 100644 --- a/dlls/nvcuda/nvcuda.spec +++ b/dlls/nvcuda/nvcuda.spec @@ -1,36 +1,36 @@ @@ -3238,7 +3238,7 @@ index 279f7ab803b..621b8d59cf0 100644 @ stub cuWGLGetDevice diff --git a/dlls/nvcuda/tests/Makefile.in b/dlls/nvcuda/tests/Makefile.in new file mode 100644 -index 00000000000..81f9290e5aa +index 0000000..81f9290 --- /dev/null +++ b/dlls/nvcuda/tests/Makefile.in @@ -0,0 +1,4 @@ @@ -3248,7 +3248,7 @@ index 00000000000..81f9290e5aa + nvcuda.c diff --git a/dlls/nvcuda/tests/nvcuda.c b/dlls/nvcuda/tests/nvcuda.c new file mode 100644 -index 00000000000..fc8f300a28b +index 0000000..fc8f300 --- /dev/null +++ b/dlls/nvcuda/tests/nvcuda.c @@ -0,0 +1,168 @@ @@ -3421,5 +3421,5 @@ index 00000000000..fc8f300a28b + test_TlsNotifyInterface(); +} -- -2.11.0 +1.9.1 diff --git a/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch b/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch index 9f494dea..770d1935 100644 --- a/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch +++ b/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch @@ -1,4 +1,4 @@ -From e147b47f3aaee67eb898e97d79133ba2d42701ea Mon Sep 17 00:00:00 2001 +From 1a242643243cb7b56a077442344a7e27fc857890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 6 Jan 2015 05:16:36 +0100 Subject: [PATCH] nvcuvid: First implementation. (rev 2) @@ -6,14 +6,14 @@ Subject: [PATCH] nvcuvid: First implementation. (rev 2) Changes by Sebastian Lackner : * Convert structures properly where the Windows and Linux definition differs. --- - configure.ac | 1 + + configure.ac | 4 +- dlls/nvcuvid/Makefile.in | 4 + dlls/nvcuvid/nvcuvid.c | 537 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/nvcuvid/nvcuvid.spec | 24 +++ include/Makefile.in | 2 + include/cuviddec.h | 99 +++++++++ include/nvcuvid.h | 79 +++++++ - 7 files changed, 746 insertions(+) + 7 files changed, 746 insertions(+), 3 deletions(-) create mode 100644 dlls/nvcuvid/Makefile.in create mode 100644 dlls/nvcuvid/nvcuvid.c create mode 100644 dlls/nvcuvid/nvcuvid.spec @@ -21,17 +21,20 @@ Changes by Sebastian Lackner : create mode 100644 include/nvcuvid.h diff --git a/configure.ac b/configure.ac -index 1083cb1..81d622d 100644 +index ce47cd0..70f9486 100644 --- a/configure.ac +++ b/configure.ac -@@ -3546,6 +3546,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests) +@@ -3554,9 +3554,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests) WINE_CONFIG_DLL(nvapi64,enable_win64) WINE_CONFIG_DLL(nvcuda) WINE_CONFIG_TEST(dlls/nvcuda/tests) +-WINE_CONFIG_DLL(objsel) +-WINE_CONFIG_DLL(odbc32) +-WINE_CONFIG_DLL(odbccp32) +WINE_CONFIG_DLL(nvcuvid) - WINE_CONFIG_DLL(objsel,,[clean]) - WINE_CONFIG_DLL(odbc32,,[implib]) - WINE_CONFIG_DLL(odbccp32,,[implib]) + WINE_CONFIG_TEST(dlls/odbccp32/tests) + WINE_CONFIG_DLL(odbccu32) + WINE_CONFIG_DLL(ole2.dll16,enable_win16) diff --git a/dlls/nvcuvid/Makefile.in b/dlls/nvcuvid/Makefile.in new file mode 100644 index 0000000..2c2dc8c diff --git a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch index 0f50b0e8..8b804c56 100644 --- a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch +++ b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch @@ -1,4 +1,4 @@ -From 7eca2e6f67b31baf24ff6bebc7359953972bb944 Mon Sep 17 00:00:00 2001 +From 094c56e89abefa4d2d4064991b360bebd13be1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 8 Feb 2015 06:10:26 +0100 Subject: [PATCH] nvencodeapi: First implementation. @@ -21,21 +21,21 @@ Subject: [PATCH] nvencodeapi: First implementation. create mode 100644 include/nvencodeapi.h diff --git a/configure.ac b/configure.ac -index 81d622db34..1c5a1dab30 100644 +index 70f9486..59d392a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3547,6 +3547,8 @@ WINE_CONFIG_DLL(nvapi64,enable_win64) +@@ -3555,6 +3555,8 @@ WINE_CONFIG_DLL(nvapi64,enable_win64) WINE_CONFIG_DLL(nvcuda) WINE_CONFIG_TEST(dlls/nvcuda/tests) WINE_CONFIG_DLL(nvcuvid) +WINE_CONFIG_DLL(nvencodeapi,enable_win32) +WINE_CONFIG_DLL(nvencodeapi64,enable_win64) - WINE_CONFIG_DLL(objsel,,[clean]) - WINE_CONFIG_DLL(odbc32,,[implib]) - WINE_CONFIG_DLL(odbccp32,,[implib]) + WINE_CONFIG_TEST(dlls/odbccp32/tests) + WINE_CONFIG_DLL(odbccu32) + WINE_CONFIG_DLL(ole2.dll16,enable_win16) diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in new file mode 100644 -index 0000000000..a2e58acaf0 +index 0000000..a2e58ac --- /dev/null +++ b/dlls/nvencodeapi/Makefile.in @@ -0,0 +1,4 @@ @@ -45,7 +45,7 @@ index 0000000000..a2e58acaf0 + nvencodeapi.c diff --git a/dlls/nvencodeapi/nvencodeapi.c b/dlls/nvencodeapi/nvencodeapi.c new file mode 100644 -index 0000000000..91a33fd589 +index 0000000..91a33fd --- /dev/null +++ b/dlls/nvencodeapi/nvencodeapi.c @@ -0,0 +1,370 @@ @@ -421,14 +421,14 @@ index 0000000000..91a33fd589 +} diff --git a/dlls/nvencodeapi/nvencodeapi.spec b/dlls/nvencodeapi/nvencodeapi.spec new file mode 100644 -index 0000000000..11d74e82d9 +index 0000000..11d74e8 --- /dev/null +++ b/dlls/nvencodeapi/nvencodeapi.spec @@ -0,0 +1 @@ +@ stdcall NvEncodeAPICreateInstance(ptr) diff --git a/dlls/nvencodeapi64/Makefile.in b/dlls/nvencodeapi64/Makefile.in new file mode 100644 -index 0000000000..8297ec352b +index 0000000..8297ec3 --- /dev/null +++ b/dlls/nvencodeapi64/Makefile.in @@ -0,0 +1,5 @@ @@ -439,13 +439,13 @@ index 0000000000..8297ec352b + nvencodeapi.c diff --git a/dlls/nvencodeapi64/nvencodeapi64.spec b/dlls/nvencodeapi64/nvencodeapi64.spec new file mode 100644 -index 0000000000..11d74e82d9 +index 0000000..11d74e8 --- /dev/null +++ b/dlls/nvencodeapi64/nvencodeapi64.spec @@ -0,0 +1 @@ +@ stdcall NvEncodeAPICreateInstance(ptr) diff --git a/include/Makefile.in b/include/Makefile.in -index 8b23127251..06dcaba694 100644 +index 8b23127..06dcaba 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -480,6 +480,7 @@ SOURCES = \ @@ -458,7 +458,7 @@ index 8b23127251..06dcaba694 100644 objectarray.idl \ diff --git a/include/nvencodeapi.h b/include/nvencodeapi.h new file mode 100644 -index 0000000000..45e9fb97f1 +index 0000000..45e9fb9 --- /dev/null +++ b/include/nvencodeapi.h @@ -0,0 +1,281 @@ @@ -744,5 +744,5 @@ index 0000000000..45e9fb97f1 + +#endif /* __WINE_NVENCODEAPI_H */ -- -2.16.1 +1.9.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e420712a..6802b560 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "5ec6b8f807f61ee77b9a96d94798c8e3f3db7af4" + echo "f9e1dbb83d850a2f7cb17079e02de139e2f8b920" } # Show version information @@ -911,9 +911,6 @@ patch_enable () msvfw32-ICGetDisplayFormat) enable_msvfw32_ICGetDisplayFormat="$2" ;; - msxml3-Normalize_Data) - enable_msxml3_Normalize_Data="$2" - ;; ntdll-APC_Performance) enable_ntdll_APC_Performance="$2" ;; @@ -5487,21 +5484,6 @@ if test "$enable_msvfw32_ICGetDisplayFormat" -eq 1; then ) >> "$patchlist" fi -# Patchset msxml3-Normalize_Data -# | -# | This patchset fixes the following Wine bugs: -# | * [#42468] Remove CRs in domtext_put_data and add them in domtext_get_xml -# | -# | Modified files: -# | * dlls/msxml3/tests/domdoc.c, dlls/msxml3/text.c -# | -if test "$enable_msxml3_Normalize_Data" -eq 1; then - patch_apply msxml3-Normalize_Data/0001-msxml3-Remove-CRs-in-domtext_put_data-and-add-them-i.patch - ( - printf '%s\n' '+ { "Alex Henrie", "msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-APC_Performance # | # | Modified files: diff --git a/patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch b/patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch index e7897970..7d412125 100644 --- a/patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch +++ b/patches/shell32-Progress_Dialog/0001-shell32-Correct-indentation-in-shfileop.c.patch @@ -1,17 +1,17 @@ -From 10dda0bfac5b79169b84f5a6eb97f0a8aee7a4eb Mon Sep 17 00:00:00 2001 +From 60b2a9f4bbbda5675491ae323b97fdcc84dacc4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 24 Feb 2015 04:25:29 +0100 -Subject: shell32: Correct indentation in shfileop.c. +Subject: [PATCH] shell32: Correct indentation in shfileop.c. --- - dlls/shell32/shlfileop.c | 728 +++++++++++++++++++++++------------------------ - 1 file changed, 364 insertions(+), 364 deletions(-) + dlls/shell32/shlfileop.c | 726 +++++++++++++++++++++++------------------------ + 1 file changed, 363 insertions(+), 363 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c -index 07635c8..ef2532d 100644 +index c18a3e9..91d5781 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c -@@ -164,7 +164,7 @@ static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) +@@ -165,7 +165,7 @@ static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) width = r.right - r.left; height = r.bottom - r.top - yOffset; MoveWindow(hDlg, (GetSystemMetrics(SM_CXSCREEN) - width)/2, @@ -20,7 +20,7 @@ index 07635c8..ef2532d 100644 confirm_msg_move_button(hDlg, IDCANCEL, &xPos, yOffset, info->bYesToAll); confirm_msg_move_button(hDlg, IDNO, &xPos, yOffset, TRUE); -@@ -206,107 +206,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H +@@ -207,107 +207,107 @@ static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, H /* confirmation dialogs content */ typedef struct { @@ -185,7 +185,7 @@ index 07635c8..ef2532d 100644 } BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) -@@ -316,23 +316,23 @@ BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) +@@ -317,18 +317,18 @@ BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir) static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars) { @@ -194,7 +194,7 @@ index 07635c8..ef2532d 100644 - if (len < minChars) - len = minChars; - -- *wPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); +- *wPath = heap_alloc(len * sizeof(WCHAR)); - if (*wPath) - { - MultiByteToWideChar(CP_ACP, 0, aPath, -1, *wPath, len); @@ -206,7 +206,7 @@ index 07635c8..ef2532d 100644 + if (len < minChars) + len = minChars; + -+ *wPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); ++ *wPath = heap_alloc(len * sizeof(WCHAR)); + if (*wPath) + { + MultiByteToWideChar(CP_ACP, 0, aPath, -1, *wPath, len); @@ -215,14 +215,8 @@ index 07635c8..ef2532d 100644 + return E_OUTOFMEMORY; } - static void SHELL32_FreeUnicodeBuf(LPWSTR wPath) - { -- HeapFree(GetProcessHeap(), 0, wPath); -+ HeapFree(GetProcessHeap(), 0, wPath); - } - HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) -@@ -375,8 +375,8 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) +@@ -371,8 +371,8 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) ret = SHNotifyRemoveDirectoryW(pszDir); return ret == ERROR_PATH_NOT_FOUND ? @@ -233,7 +227,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************** -@@ -396,41 +396,41 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) +@@ -392,41 +392,41 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) */ static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec) { @@ -246,7 +240,7 @@ index 07635c8..ef2532d 100644 - if (!retCode) - { - retCode = SHNotifyCreateDirectoryW(wPath, sec); -- SHELL32_FreeUnicodeBuf(wPath); +- heap_free(wPath); - } - return retCode; + LPWSTR wPath; @@ -258,7 +252,7 @@ index 07635c8..ef2532d 100644 + if (!retCode) + { + retCode = SHNotifyCreateDirectoryW(wPath, sec); -+ SHELL32_FreeUnicodeBuf(wPath); ++ heap_free(wPath); + } + return retCode; } @@ -298,7 +292,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************ -@@ -450,51 +450,51 @@ BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec) +@@ -446,51 +446,51 @@ BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec) */ static DWORD SHNotifyRemoveDirectoryA(LPCSTR path) { @@ -311,7 +305,7 @@ index 07635c8..ef2532d 100644 - if (!retCode) - { - retCode = SHNotifyRemoveDirectoryW(wPath); -- SHELL32_FreeUnicodeBuf(wPath); +- heap_free(wPath); - } - return retCode; + LPWSTR wPath; @@ -323,7 +317,7 @@ index 07635c8..ef2532d 100644 + if (!retCode) + { + retCode = SHNotifyRemoveDirectoryW(wPath); -+ SHELL32_FreeUnicodeBuf(wPath); ++ heap_free(wPath); + } + return retCode; } @@ -383,7 +377,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************ -@@ -514,52 +514,52 @@ BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) +@@ -510,52 +510,52 @@ BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) */ static DWORD SHNotifyDeleteFileA(LPCSTR path) { @@ -396,7 +390,7 @@ index 07635c8..ef2532d 100644 - if (!retCode) - { - retCode = SHNotifyDeleteFileW(wPath); -- SHELL32_FreeUnicodeBuf(wPath); +- heap_free(wPath); - } - return retCode; + LPWSTR wPath; @@ -408,7 +402,7 @@ index 07635c8..ef2532d 100644 + if (!retCode) + { + retCode = SHNotifyDeleteFileW(wPath); -+ SHELL32_FreeUnicodeBuf(wPath); ++ heap_free(wPath); + } + return retCode; } @@ -470,7 +464,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************ -@@ -576,36 +576,36 @@ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) +@@ -572,36 +572,36 @@ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) */ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) { @@ -537,7 +531,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************ -@@ -624,24 +624,24 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) +@@ -620,24 +620,24 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) */ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) { @@ -576,7 +570,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************* -@@ -671,9 +671,9 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) +@@ -667,9 +667,9 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) */ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path) { @@ -589,7 +583,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************* -@@ -710,18 +710,18 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path) +@@ -706,18 +706,18 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path) */ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES sec) { @@ -602,7 +596,7 @@ index 07635c8..ef2532d 100644 - if (!retCode) - { - retCode = SHCreateDirectoryExW(hWnd, wPath, sec); -- SHELL32_FreeUnicodeBuf(wPath); +- heap_free(wPath); - } - return retCode; + LPWSTR wPath; @@ -614,13 +608,13 @@ index 07635c8..ef2532d 100644 + if (!retCode) + { + retCode = SHCreateDirectoryExW(hWnd, wPath, sec); -+ SHELL32_FreeUnicodeBuf(wPath); ++ heap_free(wPath); + } + return retCode; } /************************************************************************* -@@ -731,49 +731,49 @@ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES se +@@ -727,49 +727,49 @@ int WINAPI SHCreateDirectoryExA(HWND hWnd, LPCSTR path, LPSECURITY_ATTRIBUTES se */ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES sec) { @@ -713,7 +707,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************* -@@ -793,25 +793,25 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s +@@ -789,25 +789,25 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s */ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) { @@ -758,7 +752,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************* -@@ -825,27 +825,27 @@ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) +@@ -821,27 +821,27 @@ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) */ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) { @@ -807,7 +801,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************* * SHFileOperationA [SHELL32.@] -@@ -865,42 +865,42 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) +@@ -861,42 +861,42 @@ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) */ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) { @@ -831,12 +825,12 @@ index 07635c8..ef2532d 100644 - if (ForFree) - { - retCode = SHFileOperationW(&nFileOp); -- HeapFree(GetProcessHeap(), 0, ForFree); /* we cannot use wString, it was changed */ +- heap_free(ForFree); /* we cannot use wString, it was changed */ - break; - } - else - { -- wString = ForFree = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); +- wString = ForFree = heap_alloc(size * sizeof(WCHAR)); - if (ForFree) continue; - retCode = ERROR_OUTOFMEMORY; - nFileOp.fAnyOperationsAborted = TRUE; @@ -867,12 +861,12 @@ index 07635c8..ef2532d 100644 + if (ForFree) + { + retCode = SHFileOperationW(&nFileOp); -+ HeapFree(GetProcessHeap(), 0, ForFree); /* we cannot use wString, it was changed */ ++ heap_free(ForFree); /* we cannot use wString, it was changed */ + break; + } + else + { -+ wString = ForFree = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); ++ wString = ForFree = heap_alloc(size * sizeof(WCHAR)); + if (ForFree) continue; + retCode = ERROR_OUTOFMEMORY; + nFileOp.fAnyOperationsAborted = TRUE; @@ -886,7 +880,7 @@ index 07635c8..ef2532d 100644 } #define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 -@@ -930,7 +930,7 @@ typedef struct +@@ -926,7 +926,7 @@ typedef struct static inline void grow_list(FILE_LIST *list) { FILE_ENTRY *new = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles, @@ -895,16 +889,16 @@ index 07635c8..ef2532d 100644 list->feFiles = new; list->num_alloc *= 2; } -@@ -1022,7 +1022,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) +@@ -1018,7 +1018,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) /* empty list */ if (!szFiles[0]) return ERROR_ACCESS_DENIED; - + - flList->feFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - flList->num_alloc * sizeof(FILE_ENTRY)); + flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY)); -@@ -1126,7 +1126,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST + while (*ptr) +@@ -1121,7 +1121,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST /* Don't ask the user about overwriting files when he accepted to overwrite the folder. FIXME: this is not exactly what Windows does - e.g. there would be an additional confirmation for a nested folder */ @@ -913,7 +907,7 @@ index 07635c8..ef2532d 100644 SHFileOperationW(&fileOp); } -@@ -1339,7 +1339,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1334,7 +1334,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) /* Windows also checks only the first item */ bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO) @@ -922,7 +916,7 @@ index 07635c8..ef2532d 100644 if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING)) if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom)) -@@ -1374,11 +1374,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1369,11 +1369,11 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) break; } } @@ -936,7 +930,7 @@ index 07635c8..ef2532d 100644 else ret = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); -@@ -1503,8 +1503,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con +@@ -1498,8 +1498,8 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con static void check_flags(FILEOP_FLAGS fFlags) { WORD wUnsupportedFlags = FOF_NO_CONNECTED_ELEMENTS | @@ -947,7 +941,7 @@ index 07635c8..ef2532d 100644 if (fFlags & wUnsupportedFlags) FIXME("Unsupported flags: %04x\n", fFlags); -@@ -1587,19 +1587,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) +@@ -1582,19 +1582,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) */ void WINAPI SHFreeNameMappings(HANDLE hNameMapping) { @@ -977,7 +971,7 @@ index 07635c8..ef2532d 100644 } /************************************************************************* -@@ -1705,14 +1705,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path) +@@ -1700,14 +1700,14 @@ DWORD WINAPI SheChangeDirW(LPWSTR path) } /************************************************************************* @@ -998,5 +992,5 @@ index 07635c8..ef2532d 100644 -- -2.8.0 +1.9.1 diff --git a/patches/shell32-Progress_Dialog/0002-shell32-Pass-FILE_INFORMATION-into-SHNotify-function.patch b/patches/shell32-Progress_Dialog/0002-shell32-Pass-FILE_INFORMATION-into-SHNotify-function.patch index 4c945d05..7fc28d7a 100644 --- a/patches/shell32-Progress_Dialog/0002-shell32-Pass-FILE_INFORMATION-into-SHNotify-function.patch +++ b/patches/shell32-Progress_Dialog/0002-shell32-Pass-FILE_INFORMATION-into-SHNotify-function.patch @@ -1,7 +1,8 @@ -From 9cd5e28f85b03c762b3e78d5dd26eb2833f4d385 Mon Sep 17 00:00:00 2001 +From 8102136961bf8ed57bcde4b74548562e5e3e21a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 26 Feb 2015 23:21:26 +0100 -Subject: shell32: Pass FILE_INFORMATION into SHNotify* functions. +Subject: [PATCH] shell32: Pass FILE_INFORMATION into SHNotify* + functions. Preparation of the progressbar work. Based on a patch by Huw Campbell. --- @@ -9,7 +10,7 @@ Preparation of the progressbar work. Based on a patch by Huw Campbell. 1 file changed, 98 insertions(+), 103 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c -index ea26745..e0d9b3e 100644 +index 91d5781..71de462 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -59,16 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -72,7 +73,7 @@ index ea26745..e0d9b3e 100644 /* Confirm dialogs with an optional "Yes To All" as used in file operations confirmations */ static const WCHAR CONFIRM_MSG_PROP[] = {'W','I','N','E','_','C','O','N','F','I','R','M',0}; -@@ -347,7 +373,7 @@ HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) +@@ -343,7 +369,7 @@ HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) * Asks for confirmation when bShowUI is true and deletes the directory and * all its subdirectories and files if necessary. */ @@ -81,7 +82,7 @@ index ea26745..e0d9b3e 100644 { DWORD ret = 0; HANDLE hFind; -@@ -357,16 +383,18 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) +@@ -353,16 +379,18 @@ static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) PathCombineW(szTemp, pszDir, wWildcardFile); hFind = FindFirstFileW(szTemp, &wfd); @@ -104,7 +105,7 @@ index ea26745..e0d9b3e 100644 } while (!ret && FindNextFileW(hFind, &wfd)); } FindClose(hFind); -@@ -497,22 +525,9 @@ BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) +@@ -493,22 +521,9 @@ BOOL WINAPI Win32RemoveDirectoryAW(LPCVOID path) return (SHNotifyRemoveDirectoryA(path) == ERROR_SUCCESS); } @@ -130,16 +131,16 @@ index ea26745..e0d9b3e 100644 { LPWSTR wPath; DWORD retCode; -@@ -522,7 +537,7 @@ static DWORD SHNotifyDeleteFileA(LPCSTR path) +@@ -518,7 +533,7 @@ static DWORD SHNotifyDeleteFileA(LPCSTR path) retCode = SHELL32_AnsiToUnicodeBuf(path, &wPath, 0); if (!retCode) { - retCode = SHNotifyDeleteFileW(wPath); + retCode = SHNotifyDeleteFileW(op, wPath); - SHELL32_FreeUnicodeBuf(wPath); + heap_free(wPath); } return retCode; -@@ -530,12 +545,14 @@ static DWORD SHNotifyDeleteFileA(LPCSTR path) +@@ -526,12 +541,14 @@ static DWORD SHNotifyDeleteFileA(LPCSTR path) /***********************************************************************/ @@ -155,7 +156,7 @@ index ea26745..e0d9b3e 100644 ret = DeleteFileW(path); if (!ret) { -@@ -558,8 +575,8 @@ static DWORD SHNotifyDeleteFileW(LPCWSTR path) +@@ -554,8 +571,8 @@ static DWORD SHNotifyDeleteFileW(LPCWSTR path) DWORD WINAPI Win32DeleteFileAW(LPCVOID path) { if (SHELL_OsIsUnicode()) @@ -166,7 +167,7 @@ index ea26745..e0d9b3e 100644 } /************************************************************************ -@@ -568,18 +585,21 @@ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) +@@ -564,18 +581,21 @@ DWORD WINAPI Win32DeleteFileAW(LPCVOID path) * Moves a file. Also triggers a change notify if one exists. * * PARAMS @@ -189,7 +190,7 @@ index ea26745..e0d9b3e 100644 ret = MoveFileExW(src, dest, MOVEFILE_REPLACE_EXISTING); /* MOVEFILE_REPLACE_EXISTING fails with dirs, so try MoveFile */ -@@ -614,6 +634,7 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) +@@ -610,6 +630,7 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) * Copies a file. Also triggers a change notify if one exists. * * PARAMS @@ -197,7 +198,7 @@ index ea26745..e0d9b3e 100644 * src [I] path to source file to move * dest [I] path to target file to move to * bFailIfExists [I] if TRUE, the target file will not be overwritten if -@@ -622,13 +643,15 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) +@@ -618,13 +639,15 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) * RETURNS * ERROR_SUCCESS if successful */ @@ -214,7 +215,7 @@ index ea26745..e0d9b3e 100644 /* Destination file may already exist with read only attribute */ attribs = GetFileAttributesW(dest); if (IsAttrib(attribs, FILE_ATTRIBUTE_READONLY)) -@@ -904,30 +927,6 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) +@@ -899,30 +922,6 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) return retCode; } @@ -245,7 +246,7 @@ index ea26745..e0d9b3e 100644 static inline void grow_list(FILE_LIST *list) { FILE_ENTRY *new = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles, -@@ -1091,7 +1090,7 @@ static void destroy_file_list(FILE_LIST *flList) +@@ -1085,7 +1084,7 @@ static void destroy_file_list(FILE_LIST *flList) static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWSTR szDestPath) { WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; @@ -254,7 +255,7 @@ index ea26745..e0d9b3e 100644 static const WCHAR wildCardFiles[] = {'*','.','*',0}; -@@ -1119,17 +1118,16 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST +@@ -1113,17 +1112,16 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST PathCombineW(szFrom, feFrom->szFullPath, wildCardFiles); szFrom[lstrlenW(szFrom) + 1] = '\0'; @@ -280,7 +281,7 @@ index ea26745..e0d9b3e 100644 } static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCHAR *szTo) -@@ -1140,7 +1138,7 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH +@@ -1134,7 +1132,7 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH return FALSE; } @@ -289,7 +290,7 @@ index ea26745..e0d9b3e 100644 } /* copy a file or directory to another directory */ -@@ -1180,7 +1178,7 @@ static void create_dest_dirs(LPCWSTR szDestDir) +@@ -1174,7 +1172,7 @@ static void create_dest_dirs(LPCWSTR szDestDir) } /* the FO_COPY operation */ @@ -298,7 +299,7 @@ index ea26745..e0d9b3e 100644 { DWORD i; const FILE_ENTRY *entryToCopy; -@@ -1203,7 +1201,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl +@@ -1197,7 +1195,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl fileDest = &flTo->feFiles[0]; } @@ -307,7 +308,7 @@ index ea26745..e0d9b3e 100644 { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; -@@ -1255,8 +1253,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl +@@ -1249,8 +1247,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl { entryToCopy = &flFrom->feFiles[i]; @@ -317,7 +318,7 @@ index ea26745..e0d9b3e 100644 { fileDest = &flTo->feFiles[i]; } -@@ -1328,7 +1325,7 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE +@@ -1322,7 +1319,7 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE } /* the FO_DELETE operation */ @@ -326,7 +327,7 @@ index ea26745..e0d9b3e 100644 { const FILE_ENTRY *fileEntry; DWORD i; -@@ -1339,13 +1336,13 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1333,13 +1330,13 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) return ERROR_SUCCESS; /* Windows also checks only the first item */ @@ -344,7 +345,7 @@ index ea26745..e0d9b3e 100644 return 0; } -@@ -1354,7 +1351,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1348,7 +1345,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) fileEntry = &flFrom->feFiles[i]; if (!IsAttribFile(fileEntry->attributes) && @@ -353,7 +354,7 @@ index ea26745..e0d9b3e 100644 continue; if (bTrash) -@@ -1364,14 +1361,14 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1358,14 +1355,14 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) continue; /* Note: Windows silently deletes the file in such a situation, we show a dialog */ @@ -371,7 +372,7 @@ index ea26745..e0d9b3e 100644 break; } } -@@ -1381,7 +1378,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1375,7 +1372,7 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) ret = DeleteFileW(fileEntry->szFullPath) ? ERROR_SUCCESS : GetLastError(); else @@ -380,7 +381,7 @@ index ea26745..e0d9b3e 100644 if (ret) return ret; -@@ -1391,16 +1388,16 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +@@ -1385,16 +1382,16 @@ static int delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) } /* moves a file or directory to another directory */ @@ -400,7 +401,7 @@ index ea26745..e0d9b3e 100644 { DWORD i; INT mismatched = 0; -@@ -1413,14 +1410,12 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const +@@ -1407,14 +1404,12 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const if (!flTo->dwNumFiles) return ERROR_FILE_NOT_FOUND; @@ -417,7 +418,7 @@ index ea26745..e0d9b3e 100644 flFrom->dwNumFiles > flTo->dwNumFiles) { return ERROR_CANCELLED; -@@ -1433,7 +1428,7 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const +@@ -1427,7 +1422,7 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const return ret; } @@ -426,7 +427,7 @@ index ea26745..e0d9b3e 100644 mismatched = flFrom->dwNumFiles - flTo->dwNumFiles; fileDest = &flTo->feFiles[0]; -@@ -1444,7 +1439,7 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const +@@ -1438,7 +1433,7 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const if (!PathFileExistsW(fileDest->szDirectory)) return ERROR_CANCELLED; @@ -435,7 +436,7 @@ index ea26745..e0d9b3e 100644 { if (i >= flTo->dwNumFiles) break; -@@ -1458,9 +1453,9 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const +@@ -1452,9 +1447,9 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const } if (fileDest->bExists && IsAttribDir(fileDest->attributes)) @@ -447,7 +448,7 @@ index ea26745..e0d9b3e 100644 } if (mismatched > 0) -@@ -1475,7 +1470,7 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const +@@ -1469,7 +1464,7 @@ static int move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const } /* the FO_RENAME files */ @@ -456,7 +457,7 @@ index ea26745..e0d9b3e 100644 { const FILE_ENTRY *feFrom; const FILE_ENTRY *feTo; -@@ -1497,7 +1492,7 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con +@@ -1491,7 +1486,7 @@ static int rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con if (feTo->bExists) return ERROR_ALREADY_EXISTS; @@ -465,7 +466,7 @@ index ea26745..e0d9b3e 100644 } /* alert the user if an unsupported flag is used */ -@@ -1544,16 +1539,16 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) +@@ -1538,16 +1533,16 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) switch (lpFileOp->wFunc) { case FO_COPY: @@ -487,5 +488,5 @@ index ea26745..e0d9b3e 100644 default: ret = ERROR_INVALID_PARAMETER; -- -2.5.0 +1.9.1 diff --git a/patches/shell32-SFGAO_HASSUBFOLDER/0001-shell32-Set-SFGAO_HASSUBFOLDER-correctly-for-unixfs.patch b/patches/shell32-SFGAO_HASSUBFOLDER/0001-shell32-Set-SFGAO_HASSUBFOLDER-correctly-for-unixfs.patch index 968f63b5..73640a9a 100644 --- a/patches/shell32-SFGAO_HASSUBFOLDER/0001-shell32-Set-SFGAO_HASSUBFOLDER-correctly-for-unixfs.patch +++ b/patches/shell32-SFGAO_HASSUBFOLDER/0001-shell32-Set-SFGAO_HASSUBFOLDER-correctly-for-unixfs.patch @@ -1,14 +1,15 @@ -From f4ffa65bb956b052aa50faa9d7854b67ced4ef0f Mon Sep 17 00:00:00 2001 +From 357fccddcd9891844a0d973d39b1bde6f6163033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 15 Aug 2015 21:09:22 +0200 -Subject: shell32: Set SFGAO_HASSUBFOLDER correctly for unixfs. +Subject: [PATCH] shell32: Set SFGAO_HASSUBFOLDER correctly for + unixfs. --- dlls/shell32/shfldr_unixfs.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c -index e74e4dbf55a..a57bc68a408 100644 +index 92d1728..ac24871 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1143,8 +1143,10 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci @@ -25,7 +26,7 @@ index e74e4dbf55a..a57bc68a408 100644 if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelativePath)) return E_INVALIDARG; @@ -1154,8 +1156,23 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci - HeapFree( GetProcessHeap(), 0, dos_name ); + heap_free( dos_name ); } if (_ILIsFolder(apidl[i])) - *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR | @@ -51,5 +52,5 @@ index e74e4dbf55a..a57bc68a408 100644 *attrs |= SFGAO_STREAM; if ((*attrs & SFGAO_LINK)) -- -2.14.1 +1.9.1 diff --git a/patches/shell32-SHELL_execute/0001-shell32-Properly-fail-when-a-data-object-cannot-be-i.patch b/patches/shell32-SHELL_execute/0001-shell32-Properly-fail-when-a-data-object-cannot-be-i.patch index 44fed5ab..e2ea96d9 100644 --- a/patches/shell32-SHELL_execute/0001-shell32-Properly-fail-when-a-data-object-cannot-be-i.patch +++ b/patches/shell32-SHELL_execute/0001-shell32-Properly-fail-when-a-data-object-cannot-be-i.patch @@ -1,8 +1,8 @@ -From e2c2ef9325bede76a46a6bc557ba7bddce9ceab8 Mon Sep 17 00:00:00 2001 +From 9f4fcf82f0a37cc856a191ec9d1f178b9df722c0 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Sun, 4 Jun 2017 22:12:20 +0200 -Subject: shell32: Properly fail when a data object cannot be instantiated and - expand environment strings in ShellExecute +Subject: [PATCH] shell32: Properly fail when a data object cannot be + instantiated and expand environment strings in ShellExecute --- dlls/shell32/shlexec.c | 47 +++++++++++++++++++++++++++++++++++++++++++- @@ -10,10 +10,10 @@ Subject: shell32: Properly fail when a data object cannot be instantiated and 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c -index c0ef53ab8e7..0cf112b6373 100644 +index 3034008..8d6364b 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c -@@ -1299,6 +1299,7 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC +@@ -1317,6 +1317,7 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC if ( !dataobj ) { ERR("failed to get data object\n"); @@ -21,7 +21,7 @@ index c0ef53ab8e7..0cf112b6373 100644 goto end; } -@@ -1557,6 +1558,26 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) +@@ -1575,6 +1576,26 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); } @@ -48,7 +48,7 @@ index c0ef53ab8e7..0cf112b6373 100644 /************************************************************************* * SHELL_execute [Internal] */ -@@ -1570,7 +1591,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) +@@ -1588,7 +1609,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; @@ -57,7 +57,7 @@ index c0ef53ab8e7..0cf112b6373 100644 DWORD dwApplicationNameLen = MAX_PATH+2; DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR); DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); -@@ -1676,6 +1697,29 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) +@@ -1694,6 +1715,29 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } @@ -87,19 +87,19 @@ index c0ef53ab8e7..0cf112b6373 100644 if ( ERROR_SUCCESS == ShellExecute_FromContextMenu( &sei_tmp ) ) { sei->hInstApp = (HINSTANCE) 33; -@@ -1846,6 +1890,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) +@@ -1864,6 +1908,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } +end: TRACE("retval %lu\n", retval); - HeapFree(GetProcessHeap(), 0, wszApplicationName); + heap_free(wszApplicationName); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c -index 9db12ce42a8..f0f51f54568 100644 +index 7cdae87..f5f1d77 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c -@@ -1827,7 +1827,7 @@ static fileurl_tests_t fileurl_tests[]= +@@ -1829,7 +1829,7 @@ static fileurl_tests_t fileurl_tests[]= {"file:///", "%%TMPDIR%%\\test file.shlexec", 0, 0}, /* Test shortcuts vs. URLs */ @@ -108,7 +108,7 @@ index 9db12ce42a8..f0f51f54568 100644 /* Confuse things by mixing protocols */ {"file://", "shlproto://foo/bar", USE_COLON, 0}, -@@ -1973,11 +1973,11 @@ static void test_urls(void) +@@ -1975,11 +1975,11 @@ static void test_urls(void) } /* A .lnk ending does not turn a URL into a shortcut */ @@ -123,7 +123,7 @@ index 9db12ce42a8..f0f51f54568 100644 /* Neither does a .exe extension */ rc = shell_execute(NULL, "shlproto://foo/bar.exe", NULL, NULL); -@@ -2180,13 +2180,13 @@ static void test_lnks(void) +@@ -2182,13 +2182,13 @@ static void test_lnks(void) get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); @@ -141,5 +141,5 @@ index 9db12ce42a8..f0f51f54568 100644 /* Should just run our executable */ -- -2.13.1 +1.9.1 diff --git a/patches/shell32-SHFileOperation_Win9x/0001-shell32-Choose-return-value-for-SHFileOperationW-dep.patch b/patches/shell32-SHFileOperation_Win9x/0001-shell32-Choose-return-value-for-SHFileOperationW-dep.patch index cf76de51..208005d8 100644 --- a/patches/shell32-SHFileOperation_Win9x/0001-shell32-Choose-return-value-for-SHFileOperationW-dep.patch +++ b/patches/shell32-SHFileOperation_Win9x/0001-shell32-Choose-return-value-for-SHFileOperationW-dep.patch @@ -1,27 +1,27 @@ -From 838dbfc163ed83706e88e309201d84197e6ebee1 Mon Sep 17 00:00:00 2001 +From 2100778b424bd396931a5315f8eb2360675e7e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 31 Jul 2014 04:52:01 +0200 -Subject: shell32: Choose return value for SHFileOperationW depending on - windows version +Subject: [PATCH] shell32: Choose return value for SHFileOperationW + depending on windows version --- dlls/shell32/shlfileop.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c -index cef2246..290102a 100644 +index d64d1d1..8076a99 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c -@@ -1060,7 +1060,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) +@@ -1055,7 +1055,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) /* empty list */ if (!szFiles[0]) - return ERROR_ACCESS_DENIED; + return ERROR_ACCESS_DENIED; /* S_OK for Windows 95/98 */ - flList->feFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - flList->num_alloc * sizeof(FILE_ENTRY)); -@@ -1606,7 +1606,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) + flList->feFiles = heap_alloc_zero(flList->num_alloc * sizeof(FILE_ENTRY)); + +@@ -1571,7 +1571,19 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) ZeroMemory(&flTo, sizeof(FILE_LIST)); if ((ret = parse_file_list(&flFrom, lpFileOp->pFrom))) @@ -42,5 +42,5 @@ index cef2246..290102a 100644 if (lpFileOp->wFunc != FO_DELETE) parse_file_list(&flTo, lpFileOp->pTo); -- -2.3.0 +1.9.1 diff --git a/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch b/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch index f7f76ada..e3eee9da 100644 --- a/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch +++ b/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch @@ -1,4 +1,4 @@ -From e89528274c3aabc85a1e48bbcfe4cb7ff35bad8d Mon Sep 17 00:00:00 2001 +From 7ce95ff47cea6dab389a8f7bc7db0d8daddba5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 9 Aug 2015 02:38:18 +0200 Subject: [PATCH] uxthemegtk: Add configure check and stub dll. @@ -6,13 +6,13 @@ Subject: [PATCH] uxthemegtk: Add configure check and stub dll. List of functions updated by Ivan Akulinchev . --- aclocal.m4 | 20 ++++ - configure.ac | 22 ++++ + configure.ac | 24 ++++- dlls/uxtheme-gtk/Makefile.in | 7 ++ dlls/uxtheme-gtk/uxtheme-gtk.spec | 1 + dlls/uxtheme-gtk/uxtheme.c | 218 ++++++++++++++++++++++++++++++++++++++ dlls/uxtheme-gtk/uxthemegtk.h | 88 +++++++++++++++ dlls/uxtheme-gtk/version.rc | 21 ++++ - 7 files changed, 377 insertions(+) + 7 files changed, 378 insertions(+), 1 deletion(-) create mode 100644 dlls/uxtheme-gtk/Makefile.in create mode 100644 dlls/uxtheme-gtk/uxtheme-gtk.spec create mode 100644 dlls/uxtheme-gtk/uxtheme.c @@ -20,7 +20,7 @@ List of functions updated by Ivan Akulinchev . create mode 100644 dlls/uxtheme-gtk/version.rc diff --git a/aclocal.m4 b/aclocal.m4 -index 334d7a8..b76f58c 100644 +index 3688165..fbc5ebf 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -125,6 +125,26 @@ test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L\([[^/]]\)/ -L\$(top @@ -51,7 +51,7 @@ index 334d7a8..b76f58c 100644 dnl dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]]) diff --git a/configure.ac b/configure.ac -index 16db21f..84e8dd1 100644 +index 59d392a..ef9419c 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06 @@ -62,7 +62,7 @@ index 16db21f..84e8dd1 100644 AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)])) -@@ -1489,6 +1490,26 @@ fi +@@ -1490,6 +1491,26 @@ fi WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"], [liblcms2 ${notice_platform}development files not found, Color Management won't be supported.]) @@ -89,14 +89,16 @@ index 16db21f..84e8dd1 100644 dnl **** Check for FreeType 2 **** if test "x$with_freetype" != "xno" then -@@ -3709,6 +3730,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests) - WINE_CONFIG_DLL(usp10,,[implib]) +@@ -3715,7 +3736,8 @@ WINE_CONFIG_TEST(dlls/userenv/tests) + WINE_CONFIG_DLL(usp10) WINE_CONFIG_TEST(dlls/usp10/tests) WINE_CONFIG_LIB(uuid) +-WINE_CONFIG_DLL(uxtheme) +WINE_CONFIG_DLL(uxtheme-gtk) - WINE_CONFIG_DLL(uxtheme,,[implib]) ++WINE_CONFIG_DLL(uxtheme,,[implib]) WINE_CONFIG_TEST(dlls/uxtheme/tests) WINE_CONFIG_DLL(vbscript) + WINE_CONFIG_TEST(dlls/vbscript/tests) diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in new file mode 100644 index 0000000..07cf3a0f diff --git a/patches/wined3d-1DTextures/0001-wined3d-Create-dummy-1d-textures.patch b/patches/wined3d-1DTextures/0001-wined3d-Create-dummy-1d-textures.patch index da8a1dec..129f4ac6 100644 --- a/patches/wined3d-1DTextures/0001-wined3d-Create-dummy-1d-textures.patch +++ b/patches/wined3d-1DTextures/0001-wined3d-Create-dummy-1d-textures.patch @@ -1,19 +1,19 @@ -From 16e895f9770039a4d9129d577698c8dcec90334e Mon Sep 17 00:00:00 2001 +From 0ed0c12e87f00bccb97021f0979615a492fdd373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 23 Aug 2016 22:54:14 +0200 -Subject: wined3d: Create dummy 1d textures. +Subject: [PATCH] wined3d: Create dummy 1d textures. --- - dlls/wined3d/context.c | 12 ++++++++++++ - dlls/wined3d/device.c | 26 ++++++++++++++++++++++++++ + dlls/wined3d/context.c | 13 ++++++++++++- + dlls/wined3d/device.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ - 3 files changed, 40 insertions(+) + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c -index 9b6c19ef65..b09b08c690 100644 +index 4929b84..c63bf85 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c -@@ -1736,6 +1736,7 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru +@@ -1728,6 +1728,7 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + i)); @@ -21,7 +21,7 @@ index 9b6c19ef65..b09b08c690 100644 gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, textures->tex_2d); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) -@@ -1751,8 +1752,10 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru +@@ -1743,8 +1744,10 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, textures->tex_cube_array); if (gl_info->supported[EXT_TEXTURE_ARRAY]) @@ -33,7 +33,7 @@ index 9b6c19ef65..b09b08c690 100644 if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, textures->tex_buffer); -@@ -2735,6 +2738,14 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint +@@ -2727,6 +2730,14 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint case GL_NONE: /* nothing to do */ break; @@ -49,7 +49,7 @@ index 9b6c19ef65..b09b08c690 100644 gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, textures->tex_2d); break; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index 6e275e1cff..16626040f4 100644 +index 6e275e1..1662604 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -617,6 +617,12 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ @@ -99,7 +99,7 @@ index 6e275e1cff..16626040f4 100644 checkGLcall("delete dummy textures"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index 7a606a7a42..ce563345f6 100644 +index b4d15c5..791e9d0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2863,11 +2863,13 @@ struct wined3d_state @@ -117,4 +117,5 @@ index 7a606a7a42..ce563345f6 100644 GLuint tex_2d_ms; GLuint tex_2d_ms_array; -- -2.11.0 +1.9.1 + diff --git a/patches/wined3d-1DTextures/0002-wined3d-Add-1d-texture-resource-type.patch b/patches/wined3d-1DTextures/0002-wined3d-Add-1d-texture-resource-type.patch index b53af3ea..e25dbfd6 100644 --- a/patches/wined3d-1DTextures/0002-wined3d-Add-1d-texture-resource-type.patch +++ b/patches/wined3d-1DTextures/0002-wined3d-Add-1d-texture-resource-type.patch @@ -1,7 +1,7 @@ -From 186fdd1eee6aad18b7afdf34b669b3220ce8adf8 Mon Sep 17 00:00:00 2001 +From dd6ac123b2830b7b0703ae338ac334255cbd5198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 23 Aug 2016 22:47:56 +0200 -Subject: [PATCH 02/17] wined3d: Add 1d texture resource type. +Subject: [PATCH] wined3d: Add 1d texture resource type. --- dlls/wined3d/utils.c | 1 + @@ -9,10 +9,10 @@ Subject: [PATCH 02/17] wined3d: Add 1d texture resource type. 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c -index 960909f..04c791b 100644 +index 4e1da1c..f9f250e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -4281,6 +4281,7 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) +@@ -4282,6 +4282,7 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_NONE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); @@ -21,10 +21,10 @@ index 960909f..04c791b 100644 WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h -index ed7445e..f5abd9a 100644 +index b6a2ec3..4a64e67 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h -@@ -676,8 +676,9 @@ enum wined3d_resource_type +@@ -680,8 +680,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_NONE = 0, WINED3D_RTYPE_BUFFER = 1, diff --git a/patches/wined3d-1DTextures/0003-wined3d-Add-is_power_of_two-helper-function.patch b/patches/wined3d-1DTextures/0003-wined3d-Add-is_power_of_two-helper-function.patch index b4387268..e4ee7d2c 100644 --- a/patches/wined3d-1DTextures/0003-wined3d-Add-is_power_of_two-helper-function.patch +++ b/patches/wined3d-1DTextures/0003-wined3d-Add-is_power_of_two-helper-function.patch @@ -1,14 +1,14 @@ -From 94af6271b8a843a4f51bf6d8039441a572bf4a36 Mon Sep 17 00:00:00 2001 +From 99146ea4feee6e8ce9df2e1f768ac335ab6291ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 27 Aug 2016 22:19:25 +0200 -Subject: [PATCH 03/17] wined3d: Add is_power_of_two helper function. +Subject: [PATCH] wined3d: Add is_power_of_two helper function. --- dlls/wined3d/texture.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index c9210cb..2a172ee 100644 +index ebaa3b9..17d35ad 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -101,6 +101,11 @@ static DWORD wined3d_resource_access_from_location(DWORD location) @@ -23,16 +23,16 @@ index c9210cb..2a172ee 100644 static void wined3d_texture_evict_sysmem(struct wined3d_texture *texture) { struct wined3d_texture_sub_resource *sub_resource; -@@ -1408,7 +1413,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT +@@ -1395,7 +1400,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT + else texture->target = GL_TEXTURE_2D; - texture->sub_resources[0].u.surface->texture_target = texture->target; - if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] + if ((!is_power_of_two(width) || !is_power_of_two(height)) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; -@@ -2638,18 +2643,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct +@@ -2583,18 +2588,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { diff --git a/patches/wined3d-1DTextures/0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch b/patches/wined3d-1DTextures/0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch index db639ad1..d678dad0 100644 --- a/patches/wined3d-1DTextures/0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch +++ b/patches/wined3d-1DTextures/0004-wined3d-Create-dummy-1d-textures-and-surfaces.patch @@ -1,15 +1,15 @@ -From a6d09ccfa16bcc9a55161d167f144724b5acc5a7 Mon Sep 17 00:00:00 2001 +From 4a71bb9077de9ac772437d0f6bec571197e0b8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 25 Aug 2016 19:24:47 +0200 Subject: [PATCH] wined3d: Create dummy 1d textures and surfaces. --- dlls/wined3d/resource.c | 1 + - dlls/wined3d/texture.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 168 insertions(+) + dlls/wined3d/texture.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 167 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c -index 97f7aec4e1..f3402179ac 100644 +index 97f7aec..f340217 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -75,6 +75,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * @@ -21,10 +21,10 @@ index 97f7aec4e1..f3402179ac 100644 {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index 354b62f622..5e2f68b482 100644 +index 17d35ad..ead97c8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1637,6 +1637,45 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s +@@ -1636,6 +1636,45 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s context, box, data, row_pitch, slice_pitch); } @@ -70,7 +70,7 @@ index 354b62f622..5e2f68b482 100644 static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) -@@ -2035,6 +2074,130 @@ static const struct wined3d_resource_ops texture_resource_ops = +@@ -2034,6 +2073,129 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_sub_resource_unmap, }; @@ -104,8 +104,8 @@ index 354b62f622..5e2f68b482 100644 + return WINED3DERR_INVALIDCALL; + } + -+ if (desc->usage & WINED3DUSAGE_DYNAMIC && wined3d_resource_access_is_managed(desc->access) -+ || desc->usage & WINED3DUSAGE_SCRATCH) ++ if ((desc->usage & WINED3DUSAGE_DYNAMIC && wined3d_resource_access_is_managed(desc->access)) ++ || (desc->usage & WINED3DUSAGE_SCRATCH)) + { + WARN("Attempted to create a DYNAMIC texture in pool %s.\n", wined3d_debug_resource_access(desc->access)); + return WINED3DERR_INVALIDCALL; @@ -171,7 +171,6 @@ index 354b62f622..5e2f68b482 100644 + + surface = &surfaces[idx]; + surface->container = texture; -+ surface->texture_target = texture->target; + surface->texture_level = i; + surface->texture_layer = j; + list_init(&surface->renderbuffers); @@ -201,7 +200,7 @@ index 354b62f622..5e2f68b482 100644 static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) -@@ -2952,6 +3115,10 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct +@@ -2941,6 +3103,10 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct switch (desc->resource_type) { @@ -213,5 +212,5 @@ index 354b62f622..5e2f68b482 100644 hr = texture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops); break; -- -2.16.1 +1.9.1 diff --git a/patches/wined3d-1DTextures/0005-wined3d-Implement-preparation-for-1d-textures.patch b/patches/wined3d-1DTextures/0005-wined3d-Implement-preparation-for-1d-textures.patch index 6453674b..8156f949 100644 --- a/patches/wined3d-1DTextures/0005-wined3d-Implement-preparation-for-1d-textures.patch +++ b/patches/wined3d-1DTextures/0005-wined3d-Implement-preparation-for-1d-textures.patch @@ -1,17 +1,17 @@ -From e03a886b0d0557a9ab5146bf0ac7a2d66830274c Mon Sep 17 00:00:00 2001 +From 451b07b05e97bbd1f198ee0dadbf6860e82bce59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 27 Aug 2016 22:22:26 +0200 -Subject: [PATCH 05/17] wined3d: Implement preparation for 1d textures. +Subject: [PATCH] wined3d: Implement preparation for 1d textures. --- - dlls/wined3d/texture.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 54 insertions(+), 1 deletion(-) + dlls/wined3d/texture.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index f81d7cf..90c18e8 100644 +index ead97c8..9e9ab32 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1673,7 +1673,60 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in +@@ -1660,7 +1660,62 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in static void texture1d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { @@ -53,18 +53,20 @@ index f81d7cf..90c18e8 100644 + + for (i = 0; i < sub_count; ++i) + { ++ GLenum target; + struct wined3d_surface *surface = texture->sub_resources[i].u.surface; + width = wined3d_texture_get_level_width(texture, surface->texture_level); ++ target = wined3d_texture_get_sub_resource_target(texture, i); + + if (texture->target == GL_TEXTURE_1D_ARRAY) + { -+ gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, ++ gl_info->gl_ops.gl.p_glTexImage2D(target, surface->texture_level, + internal, width, texture->layer_count, 0, format->glFormat, format->glType, NULL); + checkGLcall("glTexImage2D"); + } + else + { -+ gl_info->gl_ops.gl.p_glTexImage1D(surface->texture_target, surface->texture_level, ++ gl_info->gl_ops.gl.p_glTexImage1D(target, surface->texture_level, + internal, width, 0, format->glFormat, format->glType, NULL); + checkGLcall("glTexImage1D"); + } diff --git a/patches/wined3d-1DTextures/0006-wined3d-Implement-uploading-for-1d-textures.patch b/patches/wined3d-1DTextures/0006-wined3d-Implement-uploading-for-1d-textures.patch index 21cf7e6f..c3988421 100644 --- a/patches/wined3d-1DTextures/0006-wined3d-Implement-uploading-for-1d-textures.patch +++ b/patches/wined3d-1DTextures/0006-wined3d-Implement-uploading-for-1d-textures.patch @@ -1,18 +1,18 @@ -From b04889c49c973048a9ca14ee454e744d163b377c Mon Sep 17 00:00:00 2001 +From a8eaed59c46311213da87a7bdf955be7516e3a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 27 Aug 2016 22:25:20 +0200 -Subject: [PATCH 06/17] wined3d: Implement uploading for 1d textures. +Subject: [PATCH] wined3d: Implement uploading for 1d textures. --- dlls/wined3d/device.c | 3 ++- - dlls/wined3d/texture.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 69 insertions(+), 2 deletions(-) + dlls/wined3d/texture.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index 3961f55..eea1de8 100644 +index 1662604..352d2e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -4261,7 +4261,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str +@@ -4268,7 +4268,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = 1; depth = 1; } @@ -23,10 +23,10 @@ index 3961f55..eea1de8 100644 struct wined3d_texture *texture = texture_from_resource(resource); unsigned int level; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index 90c18e8..93b41e9 100644 +index 9e9ab32..63658a8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1657,8 +1657,74 @@ static void texture1d_upload_data(struct wined3d_texture *texture, unsigned int +@@ -1644,8 +1644,76 @@ static void texture1d_upload_data(struct wined3d_texture *texture, unsigned int const struct wined3d_context *context, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { @@ -38,6 +38,7 @@ index 90c18e8..93b41e9 100644 + const void *mem = data->addr; + void *converted_mem = NULL; + unsigned int width, x, update_w; ++ GLenum target; + + TRACE("texture %p, sub_resource_idx %u, context %p, box %p, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", texture, sub_resource_idx, context, box, data->buffer_object, data->addr, row_pitch, slice_pitch); @@ -77,18 +78,19 @@ index 90c18e8..93b41e9 100644 + checkGLcall("glBindBuffer"); + } + -+ if (surface->texture_target == GL_TEXTURE_1D_ARRAY) ++ target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); ++ if (target == GL_TEXTURE_1D_ARRAY) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, row_pitch / format->byte_count); + -+ gl_info->gl_ops.gl.p_glTexSubImage2D(surface->texture_target, level, x, surface->texture_layer, update_w, 1, format->glFormat, format->glType, mem); ++ gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, x, surface->texture_layer, update_w, 1, format->glFormat, format->glType, mem); + checkGLcall("glTexSubImage2D"); + + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + } + else + { -+ gl_info->gl_ops.gl.p_glTexSubImage1D(surface->texture_target, level, x, update_w, format->glFormat, format->glType, mem); ++ gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, x, update_w, format->glFormat, format->glType, mem); + checkGLcall("glTexSubImage1D"); + } + diff --git a/patches/wined3d-1DTextures/0007-wined3d-Implement-loading-from-system-memory-and-buf.patch b/patches/wined3d-1DTextures/0007-wined3d-Implement-loading-from-system-memory-and-buf.patch index dcf70e96..03585be6 100644 --- a/patches/wined3d-1DTextures/0007-wined3d-Implement-loading-from-system-memory-and-buf.patch +++ b/patches/wined3d-1DTextures/0007-wined3d-Implement-loading-from-system-memory-and-buf.patch @@ -1,18 +1,18 @@ -From abf26ab2c3d8fd1989bb145251899378bb4c1a0f Mon Sep 17 00:00:00 2001 +From d226965d4526ead5b70a3476f81d03df1088fb36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 27 Aug 2016 22:38:47 +0200 -Subject: [PATCH 07/17] wined3d: Implement loading from system memory and - buffers to (s)rgb 1d textures. +Subject: [PATCH] wined3d: Implement loading from system memory and buffers to + (s)rgb 1d textures. --- dlls/wined3d/texture.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index 93b41e9..c5a4f0c 100644 +index 63658a8..82ba0d4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1731,10 +1731,75 @@ static void texture1d_upload_data(struct wined3d_texture *texture, unsigned int +@@ -1720,10 +1720,75 @@ static void texture1d_upload_data(struct wined3d_texture *texture, unsigned int static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { diff --git a/patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch b/patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch index 913a73e6..cd4e14f0 100644 --- a/patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch +++ b/patches/wined3d-1DTextures/0008-wined3d-Implement-downloading-from-s-rgb-1d-textures.patch @@ -1,18 +1,18 @@ -From 8efaebed047f1b3a466f74fc982e5a3b22326ad9 Mon Sep 17 00:00:00 2001 +From b4b46e405c719c895276f10c68ddab7deeab6606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 27 Aug 2016 22:41:05 +0200 -Subject: [PATCH 08/17] wined3d: Implement downloading from (s)rgb 1d textures - to system memory. +Subject: [PATCH] wined3d: Implement downloading from (s)rgb 1d textures to + system memory. --- - dlls/wined3d/texture.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 112 insertions(+) + dlls/wined3d/texture.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 114 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index c5a4f0c..198d2a6 100644 +index 82ba0d4..da0e7d3a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1728,6 +1728,76 @@ static void texture1d_upload_data(struct wined3d_texture *texture, unsigned int +@@ -1717,6 +1717,78 @@ static void texture1d_upload_data(struct wined3d_texture *texture, unsigned int } /* Context activation is done by the caller. */ @@ -25,6 +25,7 @@ index c5a4f0c..198d2a6 100644 + struct wined3d_texture_sub_resource *sub_resource; + BYTE *temporary_mem = NULL; + void *mem; ++ GLenum target; + + sub_resource = &texture->sub_resources[sub_resource_idx]; + @@ -35,7 +36,8 @@ index c5a4f0c..198d2a6 100644 + return; + } + -+ if (surface->texture_target == GL_TEXTURE_1D_ARRAY) ++ target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); ++ if (target == GL_TEXTURE_1D_ARRAY) + { + WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n"); + @@ -56,7 +58,7 @@ index c5a4f0c..198d2a6 100644 + else + mem = data->addr; + -+ gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, sub_resource_idx, ++ gl_info->gl_ops.gl.p_glGetTexImage(target, sub_resource_idx, + format->glFormat, format->glType, mem); + checkGLcall("glGetTexImage"); + @@ -89,7 +91,7 @@ index c5a4f0c..198d2a6 100644 static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { -@@ -1790,6 +1860,48 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in +@@ -1779,6 +1851,48 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in } break; diff --git a/patches/wined3d-1DTextures/0009-wined3d-Implement-converting-between-s-rgb-1d-textur.patch b/patches/wined3d-1DTextures/0009-wined3d-Implement-converting-between-s-rgb-1d-textur.patch index 006e24b4..5d92fc84 100644 --- a/patches/wined3d-1DTextures/0009-wined3d-Implement-converting-between-s-rgb-1d-textur.patch +++ b/patches/wined3d-1DTextures/0009-wined3d-Implement-converting-between-s-rgb-1d-textur.patch @@ -1,18 +1,17 @@ -From ae4b60f9b626f36b7db26a5e93720c46b2a6c14b Mon Sep 17 00:00:00 2001 +From fe88c78871cdb3083479309e343ada20c081c949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 27 Aug 2016 22:44:14 +0200 -Subject: [PATCH 09/17] wined3d: Implement converting between (s)rgb 1d - textures. +Subject: [PATCH] wined3d: Implement converting between (s)rgb 1d textures. --- dlls/wined3d/texture.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index 198d2a6..6f27fb7 100644 +index da0e7d3a..f986bd9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1798,6 +1798,29 @@ static void texture1d_download_data(struct wined3d_texture *texture, unsigned in +@@ -1789,6 +1789,29 @@ static void texture1d_download_data(struct wined3d_texture *texture, unsigned in } /* Context activation is done by the caller. */ @@ -42,7 +41,7 @@ index 198d2a6..6f27fb7 100644 static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { -@@ -1853,6 +1876,14 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in +@@ -1844,6 +1867,14 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); texture1d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); } diff --git a/patches/wined3d-1DTextures/0010-wined3d-Check-for-1d-textures-in-wined3d_texture_upd.patch b/patches/wined3d-1DTextures/0010-wined3d-Check-for-1d-textures-in-wined3d_texture_upd.patch index 24dd9a67..876fe04d 100644 --- a/patches/wined3d-1DTextures/0010-wined3d-Check-for-1d-textures-in-wined3d_texture_upd.patch +++ b/patches/wined3d-1DTextures/0010-wined3d-Check-for-1d-textures-in-wined3d_texture_upd.patch @@ -1,7 +1,7 @@ -From b1e820f73fe2603a0798a649dcb6a9b11de14292 Mon Sep 17 00:00:00 2001 +From 3ab3d061ccb4521175d982766e7d6f984517b13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 25 Aug 2016 19:11:03 +0200 -Subject: [PATCH 10/17] wined3d: Check for 1d textures in +Subject: [PATCH] wined3d: Check for 1d textures in wined3d_texture_update_desc. --- @@ -9,10 +9,10 @@ Subject: [PATCH 10/17] wined3d: Check for 1d textures in 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c -index 6f27fb7..315d22a 100644 +index f986bd9..80609a9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -1357,6 +1357,12 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT +@@ -1345,6 +1345,12 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } diff --git a/patches/wined3d-1DTextures/0011-wined3d-Check-if-1d-teture-is-still-in-use-before-re.patch b/patches/wined3d-1DTextures/0011-wined3d-Check-if-1d-teture-is-still-in-use-before-re.patch index a14456c5..3b82681c 100644 --- a/patches/wined3d-1DTextures/0011-wined3d-Check-if-1d-teture-is-still-in-use-before-re.patch +++ b/patches/wined3d-1DTextures/0011-wined3d-Check-if-1d-teture-is-still-in-use-before-re.patch @@ -1,18 +1,17 @@ -From 9d376e1a79487f9bf5bf4d834018a495f3dda1a2 Mon Sep 17 00:00:00 2001 +From 4c2f1287c53d2b92762b1d0d88ded6690463c230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 25 Aug 2016 17:00:12 +0200 -Subject: [PATCH 11/17] wined3d: Check if 1d teture is still in use before - releasing. +Subject: [PATCH] wined3d: Check if 1d teture is still in use before releasing. --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index eea1de8..96a3093 100644 +index 352d2e7..566a8ce 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -5075,6 +5075,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso +@@ -5087,6 +5087,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso switch (type) { diff --git a/patches/wined3d-1DTextures/0012-wined3d-Generate-glsl-samplers-for-1d-texture-arrays.patch b/patches/wined3d-1DTextures/0012-wined3d-Generate-glsl-samplers-for-1d-texture-arrays.patch index 60c957ad..3dd044aa 100644 --- a/patches/wined3d-1DTextures/0012-wined3d-Generate-glsl-samplers-for-1d-texture-arrays.patch +++ b/patches/wined3d-1DTextures/0012-wined3d-Generate-glsl-samplers-for-1d-texture-arrays.patch @@ -1,17 +1,17 @@ -From 2d5f825fb62d92357cade36e6e37055cd66c96ad Mon Sep 17 00:00:00 2001 +From 148c22cfce1970d732b2b90d6d6a9018d62c4d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 25 Aug 2016 17:06:41 +0200 -Subject: [PATCH 12/17] wined3d: Generate glsl samplers for 1d texture arrays. +Subject: [PATCH] wined3d: Generate glsl samplers for 1d texture arrays. --- dlls/wined3d/glsl_shader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c -index 82df6aa..2e7285b 100644 +index 6cc030a..9760d6a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c -@@ -2577,6 +2577,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont +@@ -2576,6 +2576,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont sampler_type = "samplerCube"; break; diff --git a/patches/wined3d-1DTextures/0013-wined3d-Add-support-for-1d-textures-in-context_attac.patch b/patches/wined3d-1DTextures/0013-wined3d-Add-support-for-1d-textures-in-context_attac.patch index 816f7b2c..3252ae31 100644 --- a/patches/wined3d-1DTextures/0013-wined3d-Add-support-for-1d-textures-in-context_attac.patch +++ b/patches/wined3d-1DTextures/0013-wined3d-Add-support-for-1d-textures-in-context_attac.patch @@ -1,7 +1,7 @@ -From d243fabc017d9c3d2deede80378793771d6acd22 Mon Sep 17 00:00:00 2001 +From c6c0dbc1741ba6bde31c13b7a0a4a73b1ce26ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 25 Aug 2016 19:09:41 +0200 -Subject: [PATCH 13/17] wined3d: Add support for 1d textures in +Subject: [PATCH] wined3d: Add support for 1d textures in context_attach_gl_texture_fbo. --- @@ -9,7 +9,7 @@ Subject: [PATCH 13/17] wined3d: Add support for 1d textures in 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c -index e3e4834..d3012d2 100644 +index c63bf85..341c342 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -139,7 +139,8 @@ static void context_attach_gl_texture_fbo(struct wined3d_context *context, diff --git a/patches/wined3d-1DTextures/0014-wined3d-Handle-1d-textures-in-texture_activate_dimen.patch b/patches/wined3d-1DTextures/0014-wined3d-Handle-1d-textures-in-texture_activate_dimen.patch index c3b9e332..a31a51c9 100644 --- a/patches/wined3d-1DTextures/0014-wined3d-Handle-1d-textures-in-texture_activate_dimen.patch +++ b/patches/wined3d-1DTextures/0014-wined3d-Handle-1d-textures-in-texture_activate_dimen.patch @@ -1,18 +1,17 @@ -From 7ef5d328a51af66720dc2f7b726225ac220fb7ac Mon Sep 17 00:00:00 2001 +From 667d34bbb3fecba08bf753e0b01c7a3e9d37ef96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 25 Aug 2016 19:21:20 +0200 -Subject: [PATCH 14/17] wined3d: Handle 1d textures in - texture_activate_dimensions. +Subject: [PATCH] wined3d: Handle 1d textures in texture_activate_dimensions. --- dlls/wined3d/utils.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c -index 04c791b..6f5e1ce 100644 +index f9f250e..12a3407 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -5755,7 +5755,27 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st +@@ -5756,7 +5756,27 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st { switch (texture->target) { @@ -40,7 +39,7 @@ index 04c791b..6f5e1ce 100644 gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_3D); checkGLcall("glDisable(GL_TEXTURE_3D)"); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) -@@ -5772,6 +5792,8 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st +@@ -5773,6 +5793,8 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st checkGLcall("glEnable(GL_TEXTURE_2D)"); break; case GL_TEXTURE_RECTANGLE_ARB: @@ -49,7 +48,7 @@ index 04c791b..6f5e1ce 100644 gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_3D); -@@ -5795,12 +5817,16 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st +@@ -5796,12 +5818,16 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); } @@ -66,7 +65,7 @@ index 04c791b..6f5e1ce 100644 gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_3D); -@@ -5817,6 +5843,8 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st +@@ -5818,6 +5844,8 @@ void texture_activate_dimensions(const struct wined3d_texture *texture, const st } else { diff --git a/patches/wined3d-1DTextures/0015-wined3d-Allow-creation-of-1d-shader-views.patch b/patches/wined3d-1DTextures/0015-wined3d-Allow-creation-of-1d-shader-views.patch index 90d005c3..bbbc0199 100644 --- a/patches/wined3d-1DTextures/0015-wined3d-Allow-creation-of-1d-shader-views.patch +++ b/patches/wined3d-1DTextures/0015-wined3d-Allow-creation-of-1d-shader-views.patch @@ -1,14 +1,14 @@ -From 408eed799abaa5c3d20af6e1d7e4cbe399d355a4 Mon Sep 17 00:00:00 2001 +From 197303cb41da9b38d1bedf246cab991d8db9389c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 25 Aug 2016 19:26:07 +0200 -Subject: [PATCH 15/17] wined3d: Allow creation of 1d shader views. +Subject: [PATCH] wined3d: Allow creation of 1d shader views. --- dlls/wined3d/view.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c -index b06dacc..66c9479 100644 +index 05167f4..1eebce6 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -48,6 +48,11 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, diff --git a/patches/wined3d-1DTextures/0016-d3d11-Improve-ID3D11Device_CheckFormatSupport.patch b/patches/wined3d-1DTextures/0016-d3d11-Improve-ID3D11Device_CheckFormatSupport.patch index e45c7475..c6c8b45d 100644 --- a/patches/wined3d-1DTextures/0016-d3d11-Improve-ID3D11Device_CheckFormatSupport.patch +++ b/patches/wined3d-1DTextures/0016-d3d11-Improve-ID3D11Device_CheckFormatSupport.patch @@ -1,7 +1,7 @@ -From 3456b972410f13cdbe20ee3533b90022f08c8988 Mon Sep 17 00:00:00 2001 +From 0a3bc7c4e66bf5d1854da1d1c06fa48498011e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 4 Jun 2017 22:04:39 +0200 -Subject: [PATCH 16/17] d3d11: Improve ID3D11Device_CheckFormatSupport. +Subject: [PATCH] d3d11: Improve ID3D11Device_CheckFormatSupport. --- dlls/d3d11/device.c | 17 ++++++++++++----- @@ -10,7 +10,7 @@ Subject: [PATCH 16/17] d3d11: Improve ID3D11Device_CheckFormatSupport. 3 files changed, 64 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c -index f65c994..43a940f 100644 +index 25308c2..1183335 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3224,17 +3224,24 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device *i @@ -44,10 +44,10 @@ index f65c994..43a940f 100644 WARN("Invalid format %#x.\n", format); *format_support = 0; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index e0769a7..af6c9cf 100644 +index 5a36bc2..cf94159 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c -@@ -16027,7 +16027,8 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE +@@ -16026,7 +16026,8 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { @@ -57,7 +57,7 @@ index e0769a7..af6c9cf 100644 format, feature_name, feature_level, format_support[format]); continue; } -@@ -16040,6 +16041,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE +@@ -16039,6 +16040,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE continue; } @@ -67,7 +67,7 @@ index e0769a7..af6c9cf 100644 ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); } -@@ -16047,6 +16051,15 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE +@@ -16046,6 +16050,15 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) { @@ -83,7 +83,7 @@ index e0769a7..af6c9cf 100644 unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; struct device_desc device_desc; ID3D11Device *device; -@@ -16074,6 +16087,24 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) +@@ -16073,6 +16086,24 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!support, "Got unexpected format support %#x.\n", support); @@ -109,10 +109,10 @@ index e0769a7..af6c9cf 100644 for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c -index 924cc72..a0feb45 100644 +index f7f6452..c962146 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c -@@ -5317,10 +5317,23 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad +@@ -5314,10 +5314,23 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad case WINED3D_RTYPE_NONE: allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET; @@ -137,7 +137,7 @@ index 924cc72..a0feb45 100644 case WINED3D_RTYPE_TEXTURE_2D: allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET -@@ -5377,6 +5390,12 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad +@@ -5374,6 +5387,12 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; diff --git a/patches/wined3d-1DTextures/0017-d3d11-Allow-DXGI_FORMAT_UNKNOWN-in-CheckFormatSuppor.patch b/patches/wined3d-1DTextures/0017-d3d11-Allow-DXGI_FORMAT_UNKNOWN-in-CheckFormatSuppor.patch index 7cb89ae5..028f938d 100644 --- a/patches/wined3d-1DTextures/0017-d3d11-Allow-DXGI_FORMAT_UNKNOWN-in-CheckFormatSuppor.patch +++ b/patches/wined3d-1DTextures/0017-d3d11-Allow-DXGI_FORMAT_UNKNOWN-in-CheckFormatSuppor.patch @@ -1,8 +1,8 @@ -From 8615c6ef61159a6c5df1b9088c1de1f64410d233 Mon Sep 17 00:00:00 2001 +From 7a289a8189765f382f05e2862a082e7910d1285d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 7 Jul 2017 04:03:19 +0200 -Subject: [PATCH 17/17] d3d11: Allow DXGI_FORMAT_UNKNOWN in CheckFormatSupport - and improve tests. +Subject: [PATCH] d3d11: Allow DXGI_FORMAT_UNKNOWN in CheckFormatSupport and + improve tests. --- dlls/d3d11/device.c | 2 +- @@ -10,7 +10,7 @@ Subject: [PATCH 17/17] d3d11: Allow DXGI_FORMAT_UNKNOWN in CheckFormatSupport 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c -index 43a940f..5ed5f4d 100644 +index 1183335..aaefb0a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3241,7 +3241,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device *i @@ -23,10 +23,10 @@ index 43a940f..5ed5f4d 100644 WARN("Invalid format %#x.\n", format); *format_support = 0; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index af6c9cf..935918e 100644 +index cf94159..9ea28cc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c -@@ -16051,7 +16051,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE +@@ -16050,7 +16050,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) { @@ -35,7 +35,7 @@ index af6c9cf..935918e 100644 D3D11_FORMAT_SUPPORT_TEXTURE1D | D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D | D3D11_FORMAT_SUPPORT_TEXTURECUBE | D3D11_FORMAT_SUPPORT_MIP | D3D11_FORMAT_SUPPORT_MIP_AUTOGEN | -@@ -16094,12 +16094,10 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) +@@ -16093,12 +16093,10 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %#x.\n", hr); } diff --git a/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch b/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch index ab04c88e..89987c55 100644 --- a/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch +++ b/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch @@ -1,28 +1,31 @@ -From 067858d5fc5eedfd513b38cd4ed2c69a1b1d1270 Mon Sep 17 00:00:00 2001 +From 48d707f925a861df887aa11c13e062aa700bf3d8 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 14 Dec 2014 20:49:28 +0100 -Subject: wined3d: Add second dll with STAGING_CSMT definition set. +Subject: [PATCH] wined3d: Add second dll with STAGING_CSMT + definition set. --- - configure.ac | 1 + + configure.ac | 3 ++- dlls/wined3d-csmt/Makefile.in | 37 +++++++++++++++++++++++++++++++++++++ dlls/wined3d-csmt/version.rc | 27 +++++++++++++++++++++++++++ - 3 files changed, 65 insertions(+) + 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 dlls/wined3d-csmt/Makefile.in create mode 100644 dlls/wined3d-csmt/version.rc diff --git a/configure.ac b/configure.ac -index 1ff19c4..bf2414d 100644 +index 234d288..9161305 100644 --- a/configure.ac +++ b/configure.ac -@@ -3424,6 +3424,7 @@ WINE_CONFIG_DLL(winealsa.drv) +@@ -3805,7 +3805,8 @@ WINE_CONFIG_DLL(wineandroid.drv) WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) +-WINE_CONFIG_DLL(wined3d) +WINE_CONFIG_DLL(wined3d-csmt) - WINE_CONFIG_DLL(wined3d,,[implib]) ++WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) WINE_CONFIG_DLL(winehid.sys) + WINE_CONFIG_DLL(winejoystick.drv) diff --git a/dlls/wined3d-csmt/Makefile.in b/dlls/wined3d-csmt/Makefile.in new file mode 100644 index 0000000..bf064ed @@ -100,5 +103,5 @@ index 0000000..2fa8710 + +#include "wine/wine_common_ver.rc" -- -2.9.0 +1.9.1 diff --git a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch index 3760a6e6..a33a6f20 100644 --- a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch @@ -1,7 +1,7 @@ -From bb9c9298a20f26135492ded2056eb2e49e72c024 Mon Sep 17 00:00:00 2001 +From 63db6f4c97b04136eaf47c73a16eea4cbf7ae6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:41:02 +0200 -Subject: dxgkrnl.sys: Add stub driver. +Subject: [PATCH] dxgkrnl.sys: Add stub driver. --- configure.ac | 1 + @@ -15,12 +15,12 @@ Subject: dxgkrnl.sys: Add stub driver. create mode 100644 dlls/dxgkrnl.sys/main.c diff --git a/configure.ac b/configure.ac -index 34f2a1af63d..90ea217e887 100644 +index 588eecb..cf1ba3d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3158,6 +3158,7 @@ WINE_CONFIG_LIB(dxerr8) +@@ -3319,6 +3319,7 @@ WINE_CONFIG_LIB(dxerr8) WINE_CONFIG_LIB(dxerr9) - WINE_CONFIG_DLL(dxgi,,[implib]) + WINE_CONFIG_DLL(dxgi) WINE_CONFIG_TEST(dlls/dxgi/tests) +WINE_CONFIG_DLL(dxgkrnl.sys) WINE_CONFIG_LIB(dxguid) @@ -28,7 +28,7 @@ index 34f2a1af63d..90ea217e887 100644 WINE_CONFIG_TEST(dlls/dxva2/tests) diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in new file mode 100644 -index 00000000000..e18ea70a995 +index 0000000..e18ea70 --- /dev/null +++ b/dlls/dxgkrnl.sys/Makefile.in @@ -0,0 +1,6 @@ @@ -40,7 +40,7 @@ index 00000000000..e18ea70a995 + main.c diff --git a/dlls/dxgkrnl.sys/dxgkrnl.sys.spec b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec new file mode 100644 -index 00000000000..8487664f8a7 +index 0000000..8487664 --- /dev/null +++ b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec @@ -0,0 +1,26 @@ @@ -72,7 +72,7 @@ index 00000000000..8487664f8a7 +@ stub g_loggerInfo diff --git a/dlls/dxgkrnl.sys/main.c b/dlls/dxgkrnl.sys/main.c new file mode 100644 -index 00000000000..c5639c237c8 +index 0000000..c5639c2 --- /dev/null +++ b/dlls/dxgkrnl.sys/main.c @@ -0,0 +1,39 @@ @@ -116,10 +116,10 @@ index 00000000000..c5639c237c8 + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 275862845d1..654858f7537 100644 +index a76bb0a..f0ff79f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -2595,6 +2595,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2604,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- @@ -127,7 +127,7 @@ index 275862845d1..654858f7537 100644 12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- -@@ -2639,6 +2640,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2648,6 +2649,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- @@ -136,5 +136,5 @@ index 275862845d1..654858f7537 100644 12,,mountmgr.sys 12,,ndis.sys -- -2.13.1 +1.9.1 diff --git a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch index bab2961d..1fc79747 100644 --- a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch @@ -1,7 +1,7 @@ -From 0a1d6232f852b4ff869786aff4ec20e78ac2ce72 Mon Sep 17 00:00:00 2001 +From cf71906be02cd7ac2862f7066108a32b2bb48de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:42:32 +0200 -Subject: dxgmms1.sys: Add stub driver. +Subject: [PATCH] dxgmms1.sys: Add stub driver. --- configure.ac | 1 + @@ -15,11 +15,11 @@ Subject: dxgmms1.sys: Add stub driver. create mode 100644 dlls/dxgmms1.sys/main.c diff --git a/configure.ac b/configure.ac -index 90ea217e887..5aaa20c22b6 100644 +index cf1ba3d..343f4b4 100644 --- a/configure.ac +++ b/configure.ac -@@ -3159,6 +3159,7 @@ WINE_CONFIG_LIB(dxerr9) - WINE_CONFIG_DLL(dxgi,,[implib]) +@@ -3320,6 +3320,7 @@ WINE_CONFIG_LIB(dxerr9) + WINE_CONFIG_DLL(dxgi) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_DLL(dxgkrnl.sys) +WINE_CONFIG_DLL(dxgmms1.sys) @@ -28,7 +28,7 @@ index 90ea217e887..5aaa20c22b6 100644 WINE_CONFIG_TEST(dlls/dxva2/tests) diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in new file mode 100644 -index 00000000000..affb9ce95f8 +index 0000000..affb9ce --- /dev/null +++ b/dlls/dxgmms1.sys/Makefile.in @@ -0,0 +1,6 @@ @@ -40,7 +40,7 @@ index 00000000000..affb9ce95f8 + main.c diff --git a/dlls/dxgmms1.sys/dxgmms1.sys.spec b/dlls/dxgmms1.sys/dxgmms1.sys.spec new file mode 100644 -index 00000000000..124b0bf944d +index 0000000..124b0bf --- /dev/null +++ b/dlls/dxgmms1.sys/dxgmms1.sys.spec @@ -0,0 +1,2 @@ @@ -48,7 +48,7 @@ index 00000000000..124b0bf944d +@ stub VidSchInterface diff --git a/dlls/dxgmms1.sys/main.c b/dlls/dxgmms1.sys/main.c new file mode 100644 -index 00000000000..686493d3296 +index 0000000..686493d --- /dev/null +++ b/dlls/dxgmms1.sys/main.c @@ -0,0 +1,39 @@ @@ -92,10 +92,10 @@ index 00000000000..686493d3296 + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 654858f7537..176647b8beb 100644 +index f0ff79f..bd83ba2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -2596,6 +2596,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2605,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,dxgkrnl.sys,- @@ -103,7 +103,7 @@ index 654858f7537..176647b8beb 100644 12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- -@@ -2641,6 +2642,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2650,6 +2651,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,dxgkrnl.sys @@ -112,5 +112,5 @@ index 654858f7537..176647b8beb 100644 12,,mountmgr.sys 12,,ndis.sys -- -2.13.1 +1.9.1 diff --git a/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch b/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch index 06b83d9f..ca10386e 100644 --- a/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch +++ b/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch @@ -1,4 +1,4 @@ -From f47c0b273cc8d9765ddde4c9fa2698c58ae1db0c Mon Sep 17 00:00:00 2001 +From ee89a3402d072488571fd53dfc4cef133bf7081d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 11 Mar 2016 21:44:53 +0100 Subject: [PATCH] wuauserv: Add dummy service. @@ -13,19 +13,19 @@ Subject: [PATCH] wuauserv: Add dummy service. create mode 100644 programs/wuauserv/main.c diff --git a/configure.ac b/configure.ac -index bfca87c..ce1f326 100644 +index 5b30f88..beee787 100644 --- a/configure.ac +++ b/configure.ac -@@ -4004,6 +4004,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[install]) - WINE_CONFIG_PROGRAM(write,,[install]) - WINE_CONFIG_PROGRAM(wscript,,[install]) +@@ -4013,6 +4013,7 @@ WINE_CONFIG_PROGRAM(wordpad) + WINE_CONFIG_PROGRAM(write) + WINE_CONFIG_PROGRAM(wscript) WINE_CONFIG_TEST(programs/wscript/tests) +WINE_CONFIG_PROGRAM(wuauserv,,[install]) - WINE_CONFIG_PROGRAM(wusa,,[install]) - WINE_CONFIG_PROGRAM(xcopy,,[install]) + WINE_CONFIG_PROGRAM(wusa) + WINE_CONFIG_PROGRAM(xcopy) WINE_CONFIG_TEST(programs/xcopy/tests) diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 90acd58..638be4f 100644 +index bd83ba2..b4377ed 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -135,6 +135,7 @@ AddService=FontCache,0,FontCacheService @@ -52,7 +52,7 @@ index 90acd58..638be4f 100644 [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" -@@ -3457,6 +3460,14 @@ ErrorControl=1 +@@ -3458,6 +3461,14 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule"