From 7b687557c304bbb566732aa3fe3c5ebe42aee107 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 29 Aug 2017 00:10:33 +0200 Subject: [PATCH] Rebase against dfa1815c02d1661766c8f3a4a290635e7adb4ccf. --- ...mpile-error-in-load_library-function.patch | 25 +++++++ ...-Fix-length-parameter-for-ZeroMemory.patch | 25 ------- patches/d3d11-Deferred_Context/definition | 2 +- ...dd-a-PE-test-image-that-resembles-fo.patch | 12 ++-- ...-preparation-to-make-marshalling-com.patch | 72 +++++++++---------- patches/patchinstall.sh | 31 +++----- .../0001-reg-tests-Avoid-test-failures.patch | 54 -------------- .../wined3d-CSMT_Main/9999-IfDefined.patch | 6 +- 8 files changed, 80 insertions(+), 147 deletions(-) create mode 100644 patches/Compiler_Warnings/0002-kernel32-Fix-compile-error-in-load_library-function.patch delete mode 100644 patches/Compiler_Warnings/0003-shell32-Fix-length-parameter-for-ZeroMemory.patch delete mode 100644 patches/reg-Tests/0001-reg-tests-Avoid-test-failures.patch diff --git a/patches/Compiler_Warnings/0002-kernel32-Fix-compile-error-in-load_library-function.patch b/patches/Compiler_Warnings/0002-kernel32-Fix-compile-error-in-load_library-function.patch new file mode 100644 index 00000000..dec9eb6f --- /dev/null +++ b/patches/Compiler_Warnings/0002-kernel32-Fix-compile-error-in-load_library-function.patch @@ -0,0 +1,25 @@ +From 6bb09c3a238180db2b88afeef8f5d08aade863c0 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Mon, 28 Aug 2017 23:28:00 +0200 +Subject: kernel32: Fix compile error in load_library function. + +--- + dlls/kernel32/module.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c +index fa6f40b41e3..bfeae34326d 100644 +--- a/dlls/kernel32/module.c ++++ b/dlls/kernel32/module.c +@@ -1043,7 +1043,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) + NTSTATUS nts; + HMODULE hModule; + WCHAR *load_path; +- static const DWORD unsupported_flags = load_library_search_flags | ++ const DWORD unsupported_flags = load_library_search_flags | + LOAD_IGNORE_CODE_AUTHZ_LEVEL | + LOAD_LIBRARY_AS_IMAGE_RESOURCE | + LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | +-- +2.14.1 + diff --git a/patches/Compiler_Warnings/0003-shell32-Fix-length-parameter-for-ZeroMemory.patch b/patches/Compiler_Warnings/0003-shell32-Fix-length-parameter-for-ZeroMemory.patch deleted file mode 100644 index 7d0d8b3e..00000000 --- a/patches/Compiler_Warnings/0003-shell32-Fix-length-parameter-for-ZeroMemory.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 33717bde9e702520e23ae014c398bd7076902d43 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 4 Jun 2017 12:56:47 +0200 -Subject: shell32: Fix length parameter for ZeroMemory. - ---- - dlls/shell32/shfldr_fs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c -index c7259276d1d..10653f92b52 100644 ---- a/dlls/shell32/shfldr_fs.c -+++ b/dlls/shell32/shfldr_fs.c -@@ -1315,7 +1315,7 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, - - if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) { - SHGetPathFromIDListW (pidl, wszSrcPathRoot); -- ZeroMemory(wszDstPath, MAX_PATH+1); -+ ZeroMemory(wszDstPath, sizeof(wszDstPath)); - if (This->sPathTarget) - lstrcpynW(wszDstPath, This->sPathTarget, MAX_PATH); - PathAddBackslashW(wszSrcPathRoot); --- -2.13.0 - diff --git a/patches/d3d11-Deferred_Context/definition b/patches/d3d11-Deferred_Context/definition index 9bf20ba3..60a746b3 100644 --- a/patches/d3d11-Deferred_Context/definition +++ b/patches/d3d11-Deferred_Context/definition @@ -1 +1 @@ -Fixes: Add semi-stub for D3D11 deferred context implementation +Fixes: [43611] Add semi-stub for D3D11 deferred context implementation diff --git a/patches/kernel32-PE_Loader_Fixes/0005-kernel32-tests-Add-a-PE-test-image-that-resembles-fo.patch b/patches/kernel32-PE_Loader_Fixes/0005-kernel32-tests-Add-a-PE-test-image-that-resembles-fo.patch index 2444dafa..c2eea097 100644 --- a/patches/kernel32-PE_Loader_Fixes/0005-kernel32-tests-Add-a-PE-test-image-that-resembles-fo.patch +++ b/patches/kernel32-PE_Loader_Fixes/0005-kernel32-tests-Add-a-PE-test-image-that-resembles-fo.patch @@ -1,4 +1,4 @@ -From b2443dc0deaec8c5e7d70f1bf2004181d2240177 Mon Sep 17 00:00:00 2001 +From dab3d678b587d38bc2701763d7f20ee563a3dc16 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 2 Jan 2017 15:50:01 +0800 Subject: kernel32/tests: Add a PE test image that resembles format of some of @@ -9,7 +9,7 @@ Subject: kernel32/tests: Add a PE test image that resembles format of some of 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c -index 9ddfd8d7922..a74647b3d40 100644 +index 91a6ff05161..3890d3ba3f3 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -184,7 +184,7 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, @@ -89,9 +89,9 @@ index 9ddfd8d7922..a74647b3d40 100644 } }; int i; -@@ -709,6 +733,17 @@ static void test_Loader(void) - ret = FreeLibrary(hlib_as_data_file); - ok(ret, "FreeLibrary error %d\n", GetLastError()); +@@ -738,6 +762,17 @@ static void test_Loader(void) + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + SetLastError(0xdeadbeef); + ret = DeleteFileA(dll_name); @@ -108,5 +108,5 @@ index 9ddfd8d7922..a74647b3d40 100644 } else -- -2.11.0 +2.14.1 diff --git a/patches/oleaut32-x86_64_Marshaller/0001-oleaut32-Initial-preparation-to-make-marshalling-com.patch b/patches/oleaut32-x86_64_Marshaller/0001-oleaut32-Initial-preparation-to-make-marshalling-com.patch index 819c4f63..a7a60a4b 100644 --- a/patches/oleaut32-x86_64_Marshaller/0001-oleaut32-Initial-preparation-to-make-marshalling-com.patch +++ b/patches/oleaut32-x86_64_Marshaller/0001-oleaut32-Initial-preparation-to-make-marshalling-com.patch @@ -1,4 +1,4 @@ -From f93d65a6e5dc87784e064444e3245d0504cdd9ea Mon Sep 17 00:00:00 2001 +From 30a73575f846a045b78c6f67db6f39c6045bcc5c Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 15 Nov 2015 04:25:27 +0100 Subject: oleaut32: Initial preparation to make marshalling compatible with @@ -11,10 +11,10 @@ Subject: oleaut32: Initial preparation to make marshalling compatible with 3 files changed, 57 insertions(+), 47 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c -index f4ce311..c5aa374 100644 +index e0e1e083c48..9fd0f0374ba 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c -@@ -633,42 +633,51 @@ static const IRpcProxyBufferVtbl tmproxyvtable = { +@@ -635,42 +635,51 @@ static const IRpcProxyBufferVtbl tmproxyvtable = { TMProxyImpl_Disconnect }; @@ -77,7 +77,7 @@ index f4ce311..c5aa374 100644 } /* how much space do we use on the heap (in bytes) */ -@@ -717,7 +726,7 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { +@@ -719,7 +728,7 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { return ret; } default: @@ -86,7 +86,7 @@ index f4ce311..c5aa374 100644 } } -@@ -736,7 +745,7 @@ serialize_param( +@@ -738,7 +747,7 @@ serialize_param( BOOL debugout, BOOL dealloc, TYPEDESC *tdesc, @@ -95,7 +95,7 @@ index f4ce311..c5aa374 100644 marshal_state *buf) { HRESULT hres = S_OK; -@@ -755,7 +764,7 @@ serialize_param( +@@ -757,7 +766,7 @@ serialize_param( case VT_R8: case VT_CY: hres = S_OK; @@ -104,7 +104,7 @@ index f4ce311..c5aa374 100644 if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,8); return hres; -@@ -766,7 +775,7 @@ serialize_param( +@@ -768,7 +777,7 @@ serialize_param( case VT_R4: case VT_UI4: hres = S_OK; @@ -113,7 +113,7 @@ index f4ce311..c5aa374 100644 if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; -@@ -774,14 +783,14 @@ serialize_param( +@@ -776,14 +785,14 @@ serialize_param( case VT_UI2: case VT_BOOL: hres = S_OK; @@ -130,7 +130,7 @@ index f4ce311..c5aa374 100644 if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; -@@ -881,19 +890,19 @@ serialize_param( +@@ -883,19 +892,19 @@ serialize_param( if (debugout) TRACE_(olerelay)("NULL"); return S_OK; } @@ -153,7 +153,7 @@ index f4ce311..c5aa374 100644 if (writeit) hres = _marshal_interface(buf,&IID_IDispatch,(LPUNKNOWN)*arg); if (dealloc && *(IUnknown **)arg) -@@ -941,7 +950,7 @@ serialize_param( +@@ -943,7 +952,7 @@ serialize_param( debugout, dealloc, tdesc2, @@ -162,7 +162,7 @@ index f4ce311..c5aa374 100644 buf ); ITypeInfo_ReleaseVarDesc(tinfo2, vdesc); -@@ -958,7 +967,7 @@ serialize_param( +@@ -960,7 +969,7 @@ serialize_param( break; case TKIND_ENUM: hres = S_OK; @@ -171,7 +171,7 @@ index f4ce311..c5aa374 100644 if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); break; -@@ -984,7 +993,7 @@ serialize_param( +@@ -986,7 +995,7 @@ serialize_param( if (debugout) TRACE_(olerelay)("["); for (i=0;itdescElem, tinfo) ? (LPBYTE) *arg : (LPBYTE) arg; @@ -180,7 +180,7 @@ index f4ce311..c5aa374 100644 if (hres) return hres; if (debugout && (ielemdescVar.tdesc, @@ -255,7 +255,7 @@ index f4ce311..c5aa374 100644 buf ); ITypeInfo_ReleaseVarDesc(tinfo2, vdesc); -@@ -1248,7 +1257,7 @@ deserialize_param( +@@ -1250,7 +1259,7 @@ deserialize_param( hres = xbuf_get(buf,(LPBYTE)arg,sizeof(DWORD)); if (hres) ERR("Failed to read enum (4 byte)\n"); } @@ -264,7 +264,7 @@ index f4ce311..c5aa374 100644 break; default: ERR("Unhandled typekind %d\n",tattr->typekind); -@@ -1274,7 +1283,7 @@ deserialize_param( +@@ -1276,7 +1285,7 @@ deserialize_param( if (_passbyref(&adesc->tdescElem, tinfo)) { base = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize); @@ -273,7 +273,7 @@ index f4ce311..c5aa374 100644 } for (i=0;itdescElem, @@ -282,7 +282,7 @@ index f4ce311..c5aa374 100644 buf ); return S_OK; -@@ -1413,7 +1422,7 @@ static inline BOOL is_out_elem(const ELEMDESC *elem) +@@ -1415,7 +1424,7 @@ static inline BOOL is_out_elem(const ELEMDESC *elem) static DWORD WINAPI xCall(int method, void **args) { TMProxyImpl *tpinfo = args[0]; @@ -291,7 +291,7 @@ index f4ce311..c5aa374 100644 const FUNCDESC *fdesc; HRESULT hres; int i; -@@ -1473,7 +1482,7 @@ static DWORD WINAPI xCall(int method, void **args) +@@ -1475,7 +1484,7 @@ static DWORD WINAPI xCall(int method, void **args) if (nrofnames > sizeof(names)/sizeof(names[0])) ERR("Need more names!\n"); @@ -300,7 +300,7 @@ index f4ce311..c5aa374 100644 for (i=0;icParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; if (TRACE_ON(olerelay)) { -@@ -1540,7 +1549,7 @@ static DWORD WINAPI xCall(int method, void **args) +@@ -1542,7 +1551,7 @@ static DWORD WINAPI xCall(int method, void **args) buf.curoff = 0; /* generic deserializer using typelib description */ @@ -309,7 +309,7 @@ index f4ce311..c5aa374 100644 status = S_OK; for (i=0;icParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; -@@ -2067,7 +2076,8 @@ TMStubImpl_Invoke( +@@ -2069,7 +2078,8 @@ TMStubImpl_Invoke( const FUNCDESC *fdesc; TMStubImpl *This = impl_from_IRpcStubBuffer(iface); HRESULT hres; @@ -319,7 +319,7 @@ index f4ce311..c5aa374 100644 marshal_state buf; UINT nrofnames = 0; BSTR names[10]; -@@ -2132,7 +2142,7 @@ TMStubImpl_Invoke( +@@ -2134,7 +2144,7 @@ TMStubImpl_Invoke( nrofargs = 0; for (i=0;icParams;i++) nrofargs += _argsize(&fdesc->lprgelemdescParam[i].tdesc, tinfo); @@ -328,7 +328,7 @@ index f4ce311..c5aa374 100644 if (!args) { hres = E_OUTOFMEMORY; -@@ -2160,12 +2170,12 @@ TMStubImpl_Invoke( +@@ -2162,12 +2172,12 @@ TMStubImpl_Invoke( } } @@ -344,10 +344,10 @@ index f4ce311..c5aa374 100644 (xargs-args), args diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c -index 0891098..97f40bc 100644 +index 311cca33520..f887684bdde 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c -@@ -6402,15 +6402,15 @@ static double (* const call_double_method)(void*,int,const DWORD*,int*) = (void +@@ -6349,15 +6349,15 @@ static double (* const call_double_method)(void*,int,const DWORD*,int*) = (void * Invokes a method, or accesses a property of an object, that implements the * interface described by the type description. */ @@ -366,7 +366,7 @@ index 0891098..97f40bc 100644 if (nrargs > 30) TRACE("..."); TRACE(")\n"); } -@@ -6418,7 +6418,7 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { +@@ -6365,7 +6365,7 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { switch (callconv) { case CC_STDCALL: case CC_CDECL: @@ -376,10 +376,10 @@ index 0891098..97f40bc 100644 default: FIXME("unsupported calling convention %d\n",callconv); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h -index 8f274ba..5ecb75a 100644 +index d977dfb063f..c2e991d964d 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h -@@ -604,7 +604,7 @@ extern void heap_free(void *ptr) DECLSPEC_HIDDEN; +@@ -618,7 +618,7 @@ static inline BOOL heap_free( LPVOID mem ) HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN; @@ -389,5 +389,5 @@ index 8f274ba..5ecb75a 100644 HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; -- -2.6.2 +2.14.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 8511072f..2a7d433c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "083e61fddf90ade32a119d5b6bf84d27adefc589" + echo "dfa1815c02d1661766c8f3a4a290635e7adb4ccf" } # Show version information @@ -324,7 +324,6 @@ patch_enable_all () enable_packager_DllMain="$1" enable_quartz_MediaSeeking_Positions="$1" enable_quartz_Silence_FIXMEs="$1" - enable_reg_Tests="$1" enable_riched20_Class_Tests="$1" enable_riched20_IText_Interface="$1" enable_rpcrt4_Race_Condition="$1" @@ -1247,9 +1246,6 @@ patch_enable () quartz-Silence_FIXMEs) enable_quartz_Silence_FIXMEs="$2" ;; - reg-Tests) - enable_reg_Tests="$2" - ;; riched20-Class_Tests) enable_riched20_Class_Tests="$2" ;; @@ -2941,15 +2937,15 @@ fi # | Modified files: # | * dlls/amstream/mediastreamfilter.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, dlls/d3d8/texture.c, # | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/font.c, -# | dlls/dwrite/layout.c, dlls/fusion/tests/asmenum.c, dlls/fusion/tests/asmname.c, dlls/kernel32/oldconfig.c, -# | dlls/kernel32/tests/heap.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/ole32/storage32.h, -# | dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/rsaenh/rsaenh.c, dlls/shell32/shfldr_fs.c, dlls/vbscript/vbdisp.c, +# | dlls/dwrite/layout.c, dlls/fusion/tests/asmenum.c, dlls/fusion/tests/asmname.c, dlls/kernel32/module.c, +# | dlls/kernel32/oldconfig.c, dlls/kernel32/tests/heap.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, +# | dlls/ole32/storage32.h, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/rsaenh/rsaenh.c, dlls/vbscript/vbdisp.c, # | dlls/wined3d/glsl_shader.c, dlls/ws2_32/tests/sock.c, dlls/wsdapi/msgparams.c, include/wine/list.h, # | include/wine/rbtree.h, include/winnt.h, tools/makedep.c # | if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch - patch_apply Compiler_Warnings/0003-shell32-Fix-length-parameter-for-ZeroMemory.patch + patch_apply Compiler_Warnings/0002-kernel32-Fix-compile-error-in-load_library-function.patch patch_apply Compiler_Warnings/0004-fusion-Fix-length-parameter-for-ZeroMemory.patch patch_apply Compiler_Warnings/0005-fusion-tests-Avoid-compiler-warnings-with-GCC-7.patch patch_apply Compiler_Warnings/0006-kernel32-tests-Avoid-compiler-warnings-with-GCC-7.patch @@ -2973,7 +2969,7 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0032-wsdapi-Avoid-implicit-cast-of-interface-pointer.patch ( printf '%s\n' '+ { "Sebastian Lackner", "ole32: Fix compilation with recent versions of gcc.", 1 },'; - printf '%s\n' '+ { "Sebastian Lackner", "shell32: Fix length parameter for ZeroMemory.", 1 },'; + printf '%s\n' '+ { "Sebastian Lackner", "kernel32: Fix compile error in load_library function.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "fusion: Fix length parameter for ZeroMemory.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "fusion/tests: Avoid compiler warnings with GCC 7.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "kernel32/tests: Avoid compiler warnings with GCC 7.", 1 },'; @@ -3778,6 +3774,9 @@ fi # Patchset d3d11-Deferred_Context # | +# | This patchset fixes the following Wine bugs: +# | * [#43611] Add semi-stub for D3D11 deferred context implementation +# | # | Modified files: # | * dlls/d3d11/device.c, dlls/wined3d/buffer.c, dlls/wined3d/resource.c, dlls/wined3d/texture.c, dlls/wined3d/wined3d.spec, # | dlls/wined3d/wined3d_private.h, include/wine/wined3d.h @@ -7449,18 +7448,6 @@ if test "$enable_quartz_Silence_FIXMEs" -eq 1; then ) >> "$patchlist" fi -# Patchset reg-Tests -# | -# | Modified files: -# | * programs/reg/tests/reg.c -# | -if test "$enable_reg_Tests" -eq 1; then - patch_apply reg-Tests/0001-reg-tests-Avoid-test-failures.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "reg/tests: Avoid test failures.", 1 },'; - ) >> "$patchlist" -fi - # Patchset riched20-Class_Tests # | # | Modified files: diff --git a/patches/reg-Tests/0001-reg-tests-Avoid-test-failures.patch b/patches/reg-Tests/0001-reg-tests-Avoid-test-failures.patch deleted file mode 100644 index 780a0c00..00000000 --- a/patches/reg-Tests/0001-reg-tests-Avoid-test-failures.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5f6ebde73f07d0292c80bf47f6943d71715293ab Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 20 Aug 2017 18:37:35 +0200 -Subject: reg/tests: Avoid test failures. - ---- - programs/reg/tests/reg.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c -index b042614f49a..c2a97b25fb5 100644 ---- a/programs/reg/tests/reg.c -+++ b/programs/reg/tests/reg.c -@@ -2980,7 +2980,7 @@ static void test_unicode_import(void) - err = RegQueryValueExA(hkey, "Wine44i", NULL, &type, (BYTE *)&buffer, &size); - ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); - ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); -- todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); -+ ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); - ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); - /* Wine44j */ - size = sizeof(buffer); -@@ -2988,7 +2988,7 @@ static void test_unicode_import(void) - err = RegQueryValueExA(hkey, "Wine44j", NULL, &type, (BYTE *)&buffer, &size); - ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); - ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); -- todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); -+ ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); - ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); - /* Wine44k */ - verify_reg_nonexist(hkey, "Wine44k"); -@@ -3622,7 +3622,7 @@ static void test_unicode_import(void) - ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, - "got %u, expected 0\n", err); - if (err == ERROR_SUCCESS) -- verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); -+ verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, 0); - - test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" -@@ -3721,8 +3721,8 @@ static void test_unicode_import(void) - "\"Wine66e\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00\n" - "\"Wine66f\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00,\n\n", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); -- verify_reg(hkey, "Wine66a", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); -- verify_reg(hkey, "Wine66b", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); -+ verify_reg(hkey, "Wine66a", REG_MULTI_SZ, "Line", 5, 0); -+ verify_reg(hkey, "Wine66b", REG_MULTI_SZ, "Line", 5, 0); - verify_reg(hkey, "Wine66c", REG_MULTI_SZ, "Line", 5, 0); - verify_reg(hkey, "Wine66d", REG_MULTI_SZ, "Line", 5, 0); - verify_reg(hkey, "Wine66e", REG_MULTI_SZ, "Line\0", 6, 0); --- -2.14.1 - diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 7bee7985..ca81486c 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -136,7 +136,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c wined3d_cs_st_require_space, wined3d_cs_st_submit, wined3d_cs_st_finish, -@@ -2644,6 +2706,21 @@ static void wined3d_cs_mt_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id +@@ -2645,6 +2707,21 @@ static void wined3d_cs_mt_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id wined3d_cs_queue_submit(&cs->queue[queue_id], cs); } @@ -158,7 +158,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size_t size, struct wined3d_cs *cs) { size_t queue_size = ARRAY_SIZE(queue->data); -@@ -2705,6 +2782,16 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size +@@ -2706,6 +2783,16 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size return packet->data; } @@ -175,7 +175,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c static void *wined3d_cs_mt_require_space(struct wined3d_cs *cs, size_t size, enum wined3d_cs_queue_id queue_id) { if (cs->thread_id == GetCurrentThreadId()) -@@ -2724,6 +2811,9 @@ static void wined3d_cs_mt_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id +@@ -2725,6 +2812,9 @@ static void wined3d_cs_mt_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id static const struct wined3d_cs_ops wined3d_cs_mt_ops = {