wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : amsi: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 7c8d415895e8bc5aeca01f3c82267eb0f67213f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c8d415895e8bc5aeca01f3c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:39 2022 +0100 amsi: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amsi/Makefile.in | 1 - dlls/amsi/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in index b8be934b68a..213d3e06ce9 100644 --- a/dlls/amsi/Makefile.in +++ b/dlls/amsi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = amsi.dll C_SRCS = \ diff --git a/dlls/amsi/main.c b/dlls/amsi/main.c index f56e699c356..2c1db4c482b 100644 --- a/dlls/amsi/main.c +++ b/dlls/amsi/main.c @@ -46,7 +46,7 @@ void WINAPI AmsiCloseSession( HAMSICONTEXT context, HAMSISESSION session ) HRESULT WINAPI AmsiScanBuffer( HAMSICONTEXT context, void *buffer, ULONG length, const WCHAR *name, HAMSISESSION session, AMSI_RESULT *result ) { - FIXME( "%p, %p, %u, %s, %p, %p\n", context, buffer, length, debugstr_w(name), session, result ); + FIXME( "%p, %p, %lu, %s, %p, %p\n", context, buffer, length, debugstr_w(name), session, result ); *result = AMSI_RESULT_NOT_DETECTED; return S_OK; }

1 0

Eric Pouech : advpack: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 463822e6e9388ebd8685b9b1bf1491441cf9fa51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=463822e6e9388ebd8685b9b1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:33 2022 +0100 advpack: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/Makefile.in | 1 - dlls/advpack/advpack.c | 20 ++++++++++---------- dlls/advpack/files.c | 24 ++++++++++++------------ dlls/advpack/install.c | 4 ++-- dlls/advpack/reg.c | 8 ++++---- 5 files changed, 28 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=463822e6e9388ebd8685…

1 0

Eric Pouech : advapi32: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 7e39b60a69d4374961bf04740c3b1c1dfeed1ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e39b60a69d4374961bf0474… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:27 2022 +0100 advapi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 2 +- dlls/advapi32/advapi.c | 12 +++--- dlls/advapi32/cred.c | 54 ++++++++++++------------- dlls/advapi32/crypt.c | 100 +++++++++++++++++++++++----------------------- dlls/advapi32/eventlog.c | 16 ++++---- dlls/advapi32/lsa.c | 30 +++++++------- dlls/advapi32/registry.c | 16 ++++---- dlls/advapi32/security.c | 82 ++++++++++++++++++------------------- dlls/advapi32/service.c | 14 +++---- dlls/advapi32/wmi.c | 18 ++++----- 10 files changed, 172 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e39b60a69d4374961bf…

1 0

Eric Pouech : adsldp: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: adb7d5732e130571174a37a7b5e1ea4c1b2946f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb7d5732e130571174a37a7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:21 2022 +0100 adsldp: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 1 - dlls/adsldp/adsldp.c | 72 ++++++++++++++++++++++++------------------------- dlls/adsldp/schema.c | 8 +++--- 3 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adb7d5732e130571174a…

1 0

Eric Pouech : actxprxy: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 9da38cc0e72c4760b2573f2ec94f3395e7c6bb02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da38cc0e72c4760b2573f2e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:15 2022 +0100 actxprxy: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/actxprxy/Makefile.in | 1 - dlls/actxprxy/usrmarshal.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index bdb4fcb1ecb..a4618bd560f 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = actxprxy.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 7197ff86a98..33db1327a8d 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -175,7 +175,7 @@ HRESULT CALLBACK IEnumShellItems_Next_Proxy( ULONG *pceltFetched) { ULONG fetched; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("(%p)->(%ld, %p, %p)\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) pceltFetched = &fetched; return IEnumShellItems_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } @@ -187,7 +187,7 @@ HRESULT __RPC_STUB IEnumShellItems_Next_Stub( ULONG *pceltFetched) { HRESULT hr; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + TRACE("(%p)->(%ld, %p, %p)\n", This, celt, rgelt, pceltFetched); *pceltFetched = 0; hr = IEnumShellItems_Next(This, celt, rgelt, pceltFetched); if (hr == S_OK) *pceltFetched = celt;

1 0

Eric Pouech : activeds: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 14a5d71f39d6f0b462f2bc684c256f4730435c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a5d71f39d6f0b462f2bc68… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:09 2022 +0100 activeds: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/Makefile.in | 1 - dlls/activeds/activeds_main.c | 14 +++++++------- dlls/activeds/pathname.c | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index 0ab8281c1f2..b9fbdfeca82 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = activeds.dll IMPORTLIB = activeds IMPORTS = advapi32 ole32 oleaut32 uuid diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 9a8bb3b0e73..e04485b4e36 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -76,7 +76,7 @@ HRESULT WINAPI ADsFreeEnumerator(IEnumVARIANT* pEnumVariant) */ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VARIANT* pvar, ULONG * pcElementsFetched) { - FIXME("(%p)->(%u, %p, %p)!stub\n",pEnumVariant, cElements, pvar, pcElementsFetched); + FIXME("(%p)->(%lu, %p, %p)!stub\n",pEnumVariant, cElements, pvar, pcElementsFetched); return E_NOTIMPL; } @@ -89,7 +89,7 @@ HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *str, DWORD count, VARIANT *var) SAFEARRAY *sa; LONG idx, end = count; - TRACE("(%p, %u, %p)\n", str, count, var); + TRACE("(%p, %lu, %p)\n", str, count, var); if (!var) return E_ADS_BAD_PARAMETER; @@ -128,7 +128,7 @@ fail: */ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, VARIANT* pvar) { - FIXME("(%p, %d, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); + FIXME("(%p, %ld, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); return E_NOTIMPL; } @@ -142,7 +142,7 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD WCHAR provider[MAX_PATH], progid[MAX_PATH]; DWORD idx = 0; - TRACE("(%s,%s,%u,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj); + TRACE("(%s,%s,%lu,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj); if (!path || !riid || !obj) return E_INVALIDARG; @@ -216,7 +216,7 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD */ VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider) { - FIXME("(%d,%p,%p)!stub\n", dwErr, pszError, pszProvider); + FIXME("(%ld,%p,%p)!stub\n", dwErr, pszError, pszProvider); } /***************************************************** @@ -224,7 +224,7 @@ VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider) */ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbuflen, LPWSTR namebuf, DWORD namebuflen) { - FIXME("(%p,%p,%d,%p,%d)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); + FIXME("(%p,%p,%ld,%p,%ld)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); return E_NOTIMPL; } @@ -295,6 +295,6 @@ BOOL WINAPI ReallocADsStr(LPWSTR *ppStr, LPWSTR pStr) */ HRESULT WINAPI ADsEncodeBinaryData(PBYTE pbSrcData, DWORD dwSrcLen, LPWSTR *ppszDestData) { - FIXME("(%p,%d,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData); + FIXME("(%p,%ld,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData); return E_NOTIMPL; } diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index fbc7984f2e4..943afd5603d 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -98,21 +98,21 @@ static HRESULT WINAPI path_GetTypeInfoCount(IADsPathname *iface, UINT *count) static HRESULT WINAPI path_GetTypeInfo(IADsPathname *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%#lx,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI path_GetIDsOfNames(IADsPathname *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI path_Invoke(IADsPathname *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -180,7 +180,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) HRESULT hr; BSTR provider, server, dn; - TRACE("%p,%s,%d\n", iface, debugstr_w(adspath), type); + TRACE("%p,%s,%ld\n", iface, debugstr_w(adspath), type); if (!adspath) return E_INVALIDARG; @@ -207,7 +207,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) if (type != ADS_SETTYPE_FULL) { - FIXME("type %d not implemented\n", type); + FIXME("type %ld not implemented\n", type); return E_INVALIDARG; } @@ -227,7 +227,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) { - FIXME("%p,%d: stub\n", iface, type); + FIXME("%p,%ld: stub\n", iface, type); return E_NOTIMPL; } @@ -236,14 +236,14 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat Pathname *path = impl_from_IADsPathname(iface); int len; - TRACE("%p,%d,%p\n", iface, type, adspath); + TRACE("%p,%ld,%p\n", iface, type, adspath); if (!adspath) return E_INVALIDARG; switch (type) { default: - FIXME("type %d not implemented\n", type); + FIXME("type %ld not implemented\n", type); /* fall through */ case ADS_FORMAT_X500: @@ -320,7 +320,7 @@ static HRESULT WINAPI path_GetElement(IADsPathname *iface, LONG index, BSTR *ele WCHAR *p, *end; LONG count; - TRACE("%p,%d,%p\n", iface, index, element); + TRACE("%p,%ld,%p\n", iface, index, element); if (!element) return E_INVALIDARG; @@ -366,7 +366,7 @@ static HRESULT WINAPI path_CopyPath(IADsPathname *iface, IDispatch **path) static HRESULT WINAPI path_GetEscapedElement(IADsPathname *iface, LONG reserved, BSTR element, BSTR *str) { - FIXME("%p,%d,%s,%p: stub\n", iface, reserved, debugstr_w(element), str); + FIXME("%p,%ld,%s,%p: stub\n", iface, reserved, debugstr_w(element), str); return E_NOTIMPL; } @@ -378,7 +378,7 @@ static HRESULT WINAPI path_get_EscapedMode(IADsPathname *iface, LONG *mode) static HRESULT WINAPI path_put_EscapedMode(IADsPathname *iface, LONG mode) { - FIXME("%p,%d: stub\n", iface, mode); + FIXME("%p,%ld: stub\n", iface, mode); return E_NOTIMPL; } @@ -469,7 +469,7 @@ static ULONG WINAPI factory_AddRef(IClassFactory *iface) class_factory *factory = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&factory->ref); - TRACE("(%p) ref %u\n", iface, ref); + TRACE("(%p) ref %lu\n", iface, ref); return ref; } @@ -479,7 +479,7 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) class_factory *factory = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&factory->ref); - TRACE("(%p) ref %u\n", iface, ref); + TRACE("(%p) ref %lu\n", iface, ref); if (!ref) heap_free(factory);

1 0

Eric Pouech : aclui: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 89a837c41998e294fb41e0beabf2e40f284bd30a URL: https://source.winehq.org/git/wine.git/?a=commit;h=89a837c41998e294fb41e0be… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:03 2022 +0100 aclui: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 1 - dlls/aclui/aclui_main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index 133e31f7487..a4879f54c4b 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = aclui.dll IMPORTLIB = aclui IMPORTS = comctl32 user32 advapi32 gdi32 diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index ace58127674..0c5206ae084 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -238,7 +238,7 @@ static void init_users(struct security_page *page) if (!GetSecurityDescriptorDacl(page->sd, &present, &dacl, &defaulted)) { - ERR("Failed to query descriptor information, error %u.\n", GetLastError()); + ERR("Failed to query descriptor information, error %lu.\n", GetLastError()); return; } @@ -339,14 +339,14 @@ static void security_page_init_dlg(HWND hwnd, struct security_page *page) if (FAILED(hr = ISecurityInformation_GetSecurity(page->security, DACL_SECURITY_INFORMATION, &page->sd, FALSE))) { - ERR("Failed to get security descriptor, hr %#x.\n", hr); + ERR("Failed to get security descriptor, hr %#lx.\n", hr); return; } if (FAILED(hr = ISecurityInformation_GetAccessRights(page->security, NULL, 0, &page->access, &page->access_count, &def))) { - ERR("Failed to get access mapping, hr %#x.\n", hr); + ERR("Failed to get access mapping, hr %#lx.\n", hr); return; }

1 0

Eric Pouech : acledit: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: cc6384b0488ceb7541c45bb04787c9bc3d528ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc6384b0488ceb7541c45bb0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:09:57 2022 +0100 acledit: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/acledit/Makefile.in | 1 - dlls/acledit/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in index f117462a5ea..ca2c27e3528 100644 --- a/dlls/acledit/Makefile.in +++ b/dlls/acledit/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = acledit.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index 314fa4ab0c6..690a762b5c9 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(acledit); LONG WINAPI FMExtensionProcW(HWND hWnd, WORD wEvent, LONG lParam) { - FIXME("(%p, %d, 0x%x) stub\n", hWnd, wEvent, lParam); + FIXME("(%p, %d, 0x%lx) stub\n", hWnd, wEvent, lParam); return 0; }

1 0

Alexandre Julliard : vkd3d-shader: Undefine ERROR to avoid a compiler warning on Windows.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: vkd3d Branch: master Commit: af9bf3bbf201e8bebde9ec290b94681a7888324b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=af9bf3bbf201e8bebde9ec2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 8 15:09:51 2022 +0100 vkd3d-shader: Undefine ERROR to avoid a compiler warning on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/preproc.l | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 5454233..20cb0c3 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -22,6 +22,8 @@ #include "preproc.tab.h" +#undef ERROR /* defined in wingdi.h */ + #define YYSTYPE PREPROC_YYSTYPE #define YYLTYPE PREPROC_YYLTYPE

1 0

Alexandre Julliard : vkd3d-shader: Define S_ISREG if necessary for the Windows build.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: vkd3d Branch: master Commit: fd5d6cd454ed1d99b8288a5dc66ebfe87c51381c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd5d6cd454ed1d99b8288a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 8 15:09:29 2022 +0100 vkd3d-shader: Define S_ISREG if necessary for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/preproc.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index ac6f647..3f02ac0 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -48,6 +48,10 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, #define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n) +#ifndef S_ISREG +# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, enum vkd3d_shader_error error, const char *format, ...) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022