From 33879905f2ee0fd1145dbc494d176a5cb06f9d32 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 27 Jan 2023 17:13:51 -0600 Subject: [PATCH] Rebase against 4e5fab6214d9304004369d50b6c73b8d88cf46d8. --- ...9_36-Implement-D3DXDisassembleShader.patch | 37 ++++++++++--------- patches/patchinstall.sh | 2 +- ...networking.connectivity-Add-stub-dll.patch | 12 +++--- staging/upstream-commit | 2 +- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/patches/d3dx9_36-D3DXDisassembleShader/0004-d3dx9_36-Implement-D3DXDisassembleShader.patch b/patches/d3dx9_36-D3DXDisassembleShader/0004-d3dx9_36-Implement-D3DXDisassembleShader.patch index 0f29f759..32a96821 100644 --- a/patches/d3dx9_36-D3DXDisassembleShader/0004-d3dx9_36-Implement-D3DXDisassembleShader.patch +++ b/patches/d3dx9_36-D3DXDisassembleShader/0004-d3dx9_36-Implement-D3DXDisassembleShader.patch @@ -1,4 +1,4 @@ -From 6c3aa646aff81104eb7783138a71d4bb8cf192a7 Mon Sep 17 00:00:00 2001 +From 0ba05ea85f8f2de3c802083340eb3a9ee8df209e Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sat, 13 Feb 2016 15:29:37 +0100 Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2) @@ -6,11 +6,11 @@ Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2) Changes in v2 (by Christian Costa): * More generic code for D3DXDisassembleShader. --- - dlls/d3dx9_36/shader.c | 332 ++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 327 insertions(+), 5 deletions(-) + dlls/d3dx9_36/shader.c | 335 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 329 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c -index fe0f99180ac..54d0b158568 100644 +index 1aa75d64dc5..d98345e2288 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1,6 +1,7 @@ @@ -21,22 +21,27 @@ index fe0f99180ac..54d0b158568 100644 * Copyright 2011 Travis Athougies * * This library is free software; you can redistribute it and/or -@@ -18,7 +19,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +@@ -19,6 +20,7 @@ */ -- + #include +#include + #include "d3dx9_private.h" #include "d3dcommon.h" - #include "d3dcompiler.h" -@@ -2336,13 +2337,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample +@@ -2347,13 +2349,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample return D3D_OK; } +-HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, +- ID3DXBuffer **buffer) +-{ +- TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer); +static const char *decl_usage[] = { "position", "blendweight", "blendindices", "normal", "psize", "texcoord", + "tangent", "binormal", "tessfactor", "positiont", "color" }; -+ + +- return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0, +- comments, (ID3DBlob **)buffer); +static const char *tex_type[] = { "", "1d", "2d", "cube", "volume" }; + +static int add_modifier(char *buffer, DWORD param) @@ -298,11 +303,9 @@ index fe0f99180ac..54d0b158568 100644 + { D3DSIO_COMMENT, "", 0, instr_comment, 0x0100, 0xFFFF } +}; + - HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, -- ID3DXBuffer **buffer) ++HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, + ID3DXBuffer **disassembly) - { -- TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer); ++{ + DWORD *ptr = (DWORD *)shader; + char *buffer, *buf; + UINT capacity = 4096; @@ -314,9 +317,7 @@ index fe0f99180ac..54d0b158568 100644 + + if (!shader || !disassembly) + return D3DERR_INVALIDCALL; - -- return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0, -- comments, (ID3DBlob **)buffer); ++ + buf = buffer = HeapAlloc(GetProcessHeap(), 0, capacity); + if (!buffer) + return E_OUTOFMEMORY; @@ -370,5 +371,5 @@ index fe0f99180ac..54d0b158568 100644 struct d3dx9_texture_shader -- -2.32.0 +2.39.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 66f8ff78..2a87f1ad 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "aabdb15458aaee80b157175bc31cbaf3d57bf5e4" + echo "4e5fab6214d9304004369d50b6c73b8d88cf46d8" } # Show version information diff --git a/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch b/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch index 7ffc25d3..71e46651 100644 --- a/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch +++ b/patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From c5e833ecb1f1e4aef1b146d22230b39459d6f459 Mon Sep 17 00:00:00 2001 +From c3fe536e57885944c18d4146edff7611086cfcb6 Mon Sep 17 00:00:00 2001 From: Esdras Tarsis Date: Wed, 2 Sep 2020 23:41:19 -0300 Subject: [PATCH] windows.networking.connectivity: Add stub dll. @@ -16,17 +16,17 @@ Signed-off-by: Esdras Tarsis create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity_main.c diff --git a/configure.ac b/configure.ac -index 93d32a2dfae..125784d0396 100644 +index 9ff7c5e8914..51317b85745 100644 --- a/configure.ac +++ b/configure.ac -@@ -3201,6 +3201,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) +@@ -3125,6 +3125,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media) WINE_CONFIG_MAKEFILE(dlls/windows.media/tests) WINE_CONFIG_MAKEFILE(dlls/windows.networking) +WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity) + WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers) + WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) - WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) - WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in new file mode 100644 index 00000000000..6fc24a72feb @@ -93,5 +93,5 @@ index 00000000000..96ff0ea5af2 +} \ No newline at end of file -- -2.38.1 +2.39.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index ec972438..07c67219 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -aabdb15458aaee80b157175bc31cbaf3d57bf5e4 +4e5fab6214d9304004369d50b6c73b8d88cf46d8