From f2fd04974ffdf277ef890cbc08a30972cb0a0967 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 25 Aug 2016 23:20:12 +0200 Subject: [PATCH] Rebase against a875e3c6ab075c0603e7bf1430abdba704640602. --- patches/patchinstall.sh | 2 +- ...lement-decoding-of-SLTG-help-strings.patch | 22 +++++++++---------- .../wined3d-CSMT_Main/9999-IfDefined.patch | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index ce907dcf..e2832427 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "94845c400e2d09c96854e756075a0004c17776bb" + echo "a875e3c6ab075c0603e7bf1430abdba704640602" } # Show version information diff --git a/patches/widl-SLTG_Typelib_Support/0023-oleaut32-Implement-decoding-of-SLTG-help-strings.patch b/patches/widl-SLTG_Typelib_Support/0023-oleaut32-Implement-decoding-of-SLTG-help-strings.patch index 5ff9dd8b..8fe489fd 100644 --- a/patches/widl-SLTG_Typelib_Support/0023-oleaut32-Implement-decoding-of-SLTG-help-strings.patch +++ b/patches/widl-SLTG_Typelib_Support/0023-oleaut32-Implement-decoding-of-SLTG-help-strings.patch @@ -1,4 +1,4 @@ -From a0bdaee449916e202a5cac26f3e66c28d1566efb Mon Sep 17 00:00:00 2001 +From 9890259605aa0c35db96e3709f7fad6e840aa29c Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 26 Jan 2016 15:05:54 +0800 Subject: oleaut32: Implement decoding of SLTG help strings. @@ -10,10 +10,10 @@ Based on the patch by Sebastian Lackner . 2 files changed, 109 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c -index d8d8ec8..4fb5a95 100644 +index 82ea76c..0a5e07c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c -@@ -3717,6 +3717,87 @@ static BOOL TLB_GUIDFromString(const char *str, GUID *guid) +@@ -3703,6 +3703,87 @@ static BOOL TLB_GUIDFromString(const char *str, GUID *guid) return TRUE; } @@ -101,7 +101,7 @@ index d8d8ec8..4fb5a95 100644 static WORD SLTG_ReadString(const char *ptr, const TLBString **pStr, ITypeLibImpl *lib) { WORD bytelen; -@@ -4400,17 +4481,17 @@ static void SLTG_ProcessModule(char *pBlk, ITypeInfoImpl *pTI, +@@ -4386,17 +4467,17 @@ static void SLTG_ProcessModule(char *pBlk, ITypeInfoImpl *pTI, /* Because SLTG_OtherTypeInfo is such a painful struct, we make a more manageable copy of it into this */ typedef struct { @@ -121,7 +121,7 @@ index d8d8ec8..4fb5a95 100644 } SLTG_InternalOtherTypeInfo; /**************************************************************************** -@@ -4429,8 +4510,8 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) +@@ -4415,8 +4496,8 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) LPVOID pBlk, pFirstBlk; SLTG_LibBlk *pLibBlk; SLTG_InternalOtherTypeInfo *pOtherTypeInfoBlks; @@ -131,7 +131,7 @@ index d8d8ec8..4fb5a95 100644 int i; DWORD len, order; ITypeInfoImpl **ppTypeInfoImpl; -@@ -4496,53 +4577,55 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) +@@ -4482,53 +4563,55 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) len += 0x40; /* And now TypeInfoCount of SLTG_OtherTypeInfo */ @@ -207,16 +207,16 @@ index d8d8ec8..4fb5a95 100644 /* Now add this to pLibBLk look at what we're pointing at and possibly add 0x20, then add 0x216, sprinkle a bit a magic -@@ -4608,6 +4691,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) +@@ -4594,6 +4677,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) (*ppTypeInfoImpl)->index = i; (*ppTypeInfoImpl)->Name = SLTG_ReadName(pNameTable, pOtherTypeInfoBlks[i].name_offs, pTypeLibImpl); (*ppTypeInfoImpl)->dwHelpContext = pOtherTypeInfoBlks[i].helpcontext; + (*ppTypeInfoImpl)->DocString = decode_string(hlp_strings, pOtherTypeInfoBlks[i].extra, pOtherTypeInfoBlks[i].hlpstr_len, pTypeLibImpl); (*ppTypeInfoImpl)->guid = TLB_append_guid(&pTypeLibImpl->guid_list, &pOtherTypeInfoBlks[i].uuid, 2); - (*ppTypeInfoImpl)->typekind = pTIHeader->typekind; - (*ppTypeInfoImpl)->wMajorVerNum = pTIHeader->major_version; + (*ppTypeInfoImpl)->typeattr.typekind = pTIHeader->typekind; + (*ppTypeInfoImpl)->typeattr.wMajorVerNum = pTIHeader->major_version; diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h -index 8f274ba..94ec8f2 100644 +index 31c9ab9..93b96ea 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -387,18 +387,18 @@ typedef struct { @@ -241,5 +241,5 @@ index 8f274ba..94ec8f2 100644 /* Next we get WORD 0x0003 followed by a DWORD which if we add to -- -2.6.4 +2.9.0 diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 9d650dae..c63a8157 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -7919,7 +7919,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -4503,7 +4503,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w +@@ -4527,7 +4527,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w float y_offset = context->render_offscreen ? (center_offset - (2.0f * y) - h) / h : (center_offset - (2.0f * y) - h) / -h; @@ -7931,7 +7931,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; float z_scale = zenable ? 2.0f : 0.0f; float z_offset = zenable ? -1.0f : 0.0f; -@@ -5300,7 +5304,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d +@@ -5324,7 +5328,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } }