February 2022 - Wine-commits

Eric Pouech : olesvr32: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 100eb92bfd91d3c84ae86ba1c6caca1bac34e2bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=100eb92bfd91d3c84ae86ba1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:40 2022 +0100 olesvr32: 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/olesvr32/Makefile.in | 1 - dlls/olesvr32/olesvr_main.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in index 5efc297a7aa..0cea1ad4654 100644 --- a/dlls/olesvr32/Makefile.in +++ b/dlls/olesvr32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olesvr32.dll IMPORTLIB = olesvr32 diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c index 0ca83ba86e7..e977a7765ee 100644 --- a/dlls/olesvr32/olesvr_main.c +++ b/dlls/olesvr32/olesvr_main.c @@ -134,7 +134,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); return OLE_OK; } @@ -143,7 +143,7 @@ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer) */ OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); /* no more blocked messages :) */ *block=FALSE; return OLE_OK; @@ -154,7 +154,7 @@ OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block) */ OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc) { - FIXME("(%d): stub\n",hServerDoc); + FIXME("(%ld): stub\n",hServerDoc); return OLE_OK; } @@ -174,7 +174,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname, LPOLESERVERDOC document, LHSERVERDOC *hRet) { - FIXME("(%d,%s): stub\n", hServer, docname); + FIXME("(%ld,%s): stub\n", hServer, docname); *hRet=++OLE_current_handle; return OLE_OK; } @@ -185,7 +185,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname, */ OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s): stub.\n",hDoc, newName); + FIXME("(%ld,%s): stub.\n",hDoc, newName); return OLE_OK; } @@ -195,7 +195,7 @@ OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; } @@ -205,7 +205,7 @@ OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC hDoc) */ OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; } @@ -215,6 +215,6 @@ OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc) */ OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer) { - FIXME("(%d): stub.\n", hServer); + FIXME("(%ld): stub.\n", hServer); return OLE_OK; }

1 0

Eric Pouech : olesvr.dll16: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 91b19177c791ae62e2378638ee0b3ea033993df2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b19177c791ae62e2378638… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:46 2022 +0100 olesvr.dll16: 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/olesvr.dll16/Makefile.in | 1 - dlls/olesvr.dll16/olesvr.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in index 49c07bdcc76..d894b588007 100644 --- a/dlls/olesvr.dll16/Makefile.in +++ b/dlls/olesvr.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olesvr.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll diff --git a/dlls/olesvr.dll16/olesvr.c b/dlls/olesvr.dll16/olesvr.c index 44e68228f4c..aee28df4340 100644 --- a/dlls/olesvr.dll16/olesvr.c +++ b/dlls/olesvr.dll16/olesvr.c @@ -148,7 +148,7 @@ OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct, */ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) { - FIXME("%d - stub\n",hServer); + FIXME("%ld - stub\n",hServer); return OLE_OK; } @@ -157,7 +157,7 @@ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) */ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); return OLE_OK; } @@ -166,7 +166,7 @@ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) */ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); /* no more blocked messages :) */ *block=FALSE; return OLE_OK; @@ -179,7 +179,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname, LPOLESERVERDOC document, LHSERVERDOC *hRet) { - FIXME("(%d,%s): stub\n",hServer, docname); + FIXME("(%ld,%s): stub\n",hServer, docname); *hRet=++OLE_current_handle; return OLE_OK; } @@ -189,7 +189,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname, */ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) { - FIXME("%d - stub\n",hServerDoc); + FIXME("%ld - stub\n",hServerDoc); return OLE_OK; } @@ -199,7 +199,7 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) */ OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s): stub.\n", hDoc, newName); + FIXME("(%ld,%s): stub.\n", hDoc, newName); return OLE_OK; } @@ -209,7 +209,7 @@ OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; } @@ -219,6 +219,6 @@ OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc) */ OLESTATUS WINAPI OleSavedServerDoc16(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; }

1 0

Eric Pouech : mfplat: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: d9ade7461ed3398723319f452edb31533c03b7c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9ade7461ed3398723319f45… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:26 2022 +0100 mfplat: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 1 - dlls/mfplat/buffer.c | 28 ++++----- dlls/mfplat/main.c | 144 +++++++++++++++++++++---------------------- dlls/mfplat/mediatype.c | 36 +++++------ dlls/mfplat/mfplat_private.h | 4 +- dlls/mfplat/queue.c | 8 +-- dlls/mfplat/sample.c | 26 ++++---- 7 files changed, 123 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9ade7461ed339872331…

1 0

Eric Pouech : msadp32.acm: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 6cdeed87b32f7f5a2129369155966bc14266fb8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cdeed87b32f7f5a21293691… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:47 2022 +0100 msadp32.acm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msadp32.acm/Makefile.in | 1 - dlls/msadp32.acm/msadp32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msadp32.acm/Makefile.in b/dlls/msadp32.acm/Makefile.in index 1f50f9e5673..6828872bc68 100644 --- a/dlls/msadp32.acm/Makefile.in +++ b/dlls/msadp32.acm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msadp32.acm IMPORTS = winmm user32 diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 8b83f69c006..2dc11b9239a 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -425,7 +425,7 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -486,12 +486,12 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) init_wfx_adpcm((ADPCMWAVEFORMAT*)afd->pwfx); break; default: - WARN("Unsupported tag %08x\n", afd->dwFormatTag); + WARN("Unsupported tag %08lx\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -736,7 +736,7 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS } break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -757,7 +757,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -782,7 +782,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD LRESULT CALLBACK ADPCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %04x %08lx %08lx);\n", + TRACE("(%08Ix %p %04x %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg)

1 0

Eric Pouech : msg711.acm: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: e480f936810c2bd6cb56237e77f0e87b92e3bf4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e480f936810c2bd6cb56237e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:29 2022 +0100 msg711.acm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/Makefile.in | 1 - dlls/msg711.acm/msg711.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msg711.acm/Makefile.in b/dlls/msg711.acm/Makefile.in index c90b9badbaa..baf8627a0a4 100644 --- a/dlls/msg711.acm/Makefile.in +++ b/dlls/msg711.acm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msg711.acm IMPORTS = winmm user32 diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 7478bfd92a1..69461e92803 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -697,7 +697,7 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -768,12 +768,12 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->cbSize = 0; break; default: - WARN("Unsupported tag %08x\n", afd->dwFormatTag); + WARN("Unsupported tag %08lx\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -1028,7 +1028,7 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI } break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -1049,7 +1049,7 @@ static LRESULT G711_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADE ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -1074,7 +1074,7 @@ static LRESULT G711_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADE LRESULT CALLBACK G711_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %04x %08lx %08lx);\n", + TRACE("(%08Ix %p %04x %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg)

1 0

Eric Pouech : msgsm32.acm: Enable compilation with long types.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 7f6c6863954b9bee74cfe7d6f077438dd47bbd0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f6c6863954b9bee74cfe7d6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:35 2022 +0100 msgsm32.acm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msgsm32.acm/Makefile.in | 1 - dlls/msgsm32.acm/msgsm32.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/msgsm32.acm/Makefile.in b/dlls/msgsm32.acm/Makefile.in index a72f7880fce..41bd1703abf 100644 --- a/dlls/msgsm32.acm/Makefile.in +++ b/dlls/msgsm32.acm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msgsm32.acm IMPORTS = $(GSM_PE_LIBS) winmm user32 EXTRAINCL = $(GSM_PE_CFLAGS) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 83624139a0a..002604f0450 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -90,7 +90,7 @@ static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx) } if (wfx->nAvgBytesPerSec != wfx->nBlockAlign * wfx->nSamplesPerSec) { - WARN("PCM nAvgBytesPerSec %u/%u\n", + WARN("PCM nAvgBytesPerSec %lu/%lu\n", wfx->nAvgBytesPerSec, wfx->nBlockAlign * wfx->nSamplesPerSec); return FALSE; @@ -120,7 +120,7 @@ static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx) } if (wfx->nAvgBytesPerSec != wfx->nSamplesPerSec * 65 / 320) { - WARN("GSM nAvgBytesPerSec %d / %d\n", + WARN("GSM nAvgBytesPerSec %ld / %ld\n", wfx->nAvgBytesPerSec, wfx->nSamplesPerSec * 65 / 320); return FALSE; } @@ -163,7 +163,7 @@ static LRESULT GSM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -220,12 +220,12 @@ static LRESULT GSM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) ((GSM610WAVEFORMAT*)afd->pwfx)->wSamplesPerBlock = 320; break; default: - WARN("Unsupported tag %08x\n", afd->dwFormatTag); + WARN("Unsupported tag %08lx\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -375,7 +375,7 @@ static LRESULT GSM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZ } return MMSYSERR_NOERROR; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } } @@ -398,7 +398,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* Reset the index to 0, just to be sure */ @@ -493,7 +493,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER adsh->cbSrcLengthUsed = nsrc; adsh->cbDstLengthUsed = ndst; - TRACE("%d(%d) -> %d(%d)\n", nsrc, adsh->cbSrcLength, ndst, adsh->cbDstLength); + TRACE("%ld(%ld) -> %ld(%ld)\n", nsrc, adsh->cbSrcLength, ndst, adsh->cbDstLength); return MMSYSERR_NOERROR; } @@ -503,7 +503,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %04x %08lx %08lx);\n", + TRACE("(%08Ix %p %04x %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg)

1 0

Alexandre Julliard : secur32: Add stubs for DeleteSecurityPackageA/W.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 3eca3516adcf2eddd47f8b024d8877f3b3d5157e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eca3516adcf2eddd47f8b02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:07:33 2022 +0100 secur32: Add stubs for DeleteSecurityPackageA/W. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 12 ++++++++++++ dlls/secur32/secur32.spec | 4 ++-- dlls/security/security.spec | 12 ++++++------ dlls/sspicli/sspicli.spec | 4 ++-- tools/make_specfiles | 1 + 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index a20469a3ff3..05ec6b1e692 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1058,6 +1058,18 @@ SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR name, SECURITY_PACKAGE_OPTIONS return E_NOTIMPL; } +SECURITY_STATUS WINAPI DeleteSecurityPackageA(LPSTR name) +{ + FIXME("(%s)\n", debugstr_a(name)); + return E_NOTIMPL; +} + +SECURITY_STATUS WINAPI DeleteSecurityPackageW(LPWSTR name) +{ + FIXME("(%s)\n", debugstr_w(name)); + return E_NOTIMPL; +} + /*********************************************************************** * GetUserNameExA (SECUR32.@) */ diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index ee872c50774..c4824d36f91 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -12,8 +12,8 @@ @ stdcall CompleteAuthToken(ptr ptr) @ stdcall DecryptMessage(ptr ptr long ptr) @ stdcall DeleteSecurityContext(ptr) -@ stub DeleteSecurityPackageA -@ stub DeleteSecurityPackageW +@ stdcall DeleteSecurityPackageA(str) +@ stdcall DeleteSecurityPackageW(wstr) @ stdcall EncryptMessage(ptr long ptr long) @ stdcall EnumerateSecurityPackagesA(ptr ptr) @ stdcall EnumerateSecurityPackagesW(ptr ptr) diff --git a/dlls/security/security.spec b/dlls/security/security.spec index 02f9f0aa362..1611b117d94 100644 --- a/dlls/security/security.spec +++ b/dlls/security/security.spec @@ -1,14 +1,14 @@ @ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) secur32.AcceptSecurityContext @ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleA @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleW -@ stub AddSecurityPackageA # secur32.AddSecurityPackageA -@ stub AddSecurityPackageW # secur32.AddSecurityPackageW +@ stdcall AddSecurityPackageA(str ptr) secur32.AddSecurityPackageA +@ stdcall AddSecurityPackageW(wstr ptr) secur32.AddSecurityPackageW @ stdcall ApplyControlToken(ptr ptr) secur32.ApplyControlToken @ stdcall CompleteAuthToken(ptr ptr) secur32.CompleteAuthToken @ stdcall DecryptMessage(ptr ptr long ptr) secur32.DecryptMessage @ stdcall DeleteSecurityContext(ptr) secur32.DeleteSecurityContext -@ stub DeleteSecurityPackageA # secur32.DeleteSecurityPackageA -@ stub DeleteSecurityPackageW # secur32.DeleteSecurityPackageW +@ stdcall DeleteSecurityPackageA(str) secur32.DeleteSecurityPackageA +@ stdcall DeleteSecurityPackageW(wstr) secur32.DeleteSecurityPackageW @ stdcall EncryptMessage(ptr long ptr long) secur32.EncryptMessage @ stdcall EnumerateSecurityPackagesA(ptr ptr) secur32.EnumerateSecurityPackagesA @ stdcall EnumerateSecurityPackagesW(ptr ptr) secur32.EnumerateSecurityPackagesW @@ -31,6 +31,6 @@ @ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA @ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW @ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext -@ stdcall SealMessage(ptr long ptr long) secur32.EncryptMessage -@ stdcall UnsealMessage(ptr ptr long ptr) secur32.DecryptMessage +@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage @ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index 38e166e9f0d..c3b784bcfdd 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -13,8 +13,8 @@ @ stub CredUnmarshalTargetInfo @ stdcall DecryptMessage(ptr ptr long ptr) secur32.DecryptMessage @ stdcall DeleteSecurityContext(ptr) secur32.DeleteSecurityContext -@ stub DeleteSecurityPackageA -@ stub DeleteSecurityPackageW +@ stdcall DeleteSecurityPackageA(str) secur32.DeleteSecurityPackageA +@ stdcall DeleteSecurityPackageW(wstr) secur32.DeleteSecurityPackageW @ stdcall EncryptMessage(ptr long ptr long) secur32.EncryptMessage @ stdcall EnumerateSecurityPackagesA(ptr ptr) secur32.EnumerateSecurityPackagesA @ stdcall EnumerateSecurityPackagesW(ptr ptr) secur32.EnumerateSecurityPackagesW diff --git a/tools/make_specfiles b/tools/make_specfiles index 8f83034f160..1e1e809c221 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -375,6 +375,7 @@ my @dll_groups = ], [ "secur32", + "security", "sspicli", ], [

1 0

Alexandre Julliard : winebuild: Add support for generating data-only DLLs.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 39f6ab55a970dc242304621026b90444037a3daa URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f6ab55a970dc2423046210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 14:58:49 2022 +0100 winebuild: Add support for generating data-only DLLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 + tools/winebuild/main.c | 12 ++ tools/winebuild/parser.c | 6 + tools/winebuild/spec32.c | 241 +++++++++++++++++++++++++++------------ tools/winebuild/utils.c | 2 +- tools/winebuild/winebuild.man.in | 5 + 6 files changed, 194 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39f6ab55a970dc242304…

1 0

Alexandre Julliard : winegcc: Add support for winebuild --data-only option.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 1662af11a431bee91ece23c331389530379bea4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1662af11a431bee91ece23c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:08:05 2022 +0100 winegcc: Add support for winebuild --data-only option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9bee77e3b66..bcec3916843 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -171,6 +171,7 @@ struct options int nostartfiles; int nodefaultlibs; int noshortwchar; + int data_only; int unix_lib; int gui_app; int unicode_app; @@ -1091,6 +1092,28 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, return spec_o_name; } +/* run winebuild to generate a data-only library */ +static void build_data_lib( struct options *opts, const char *spec_file, const char *output_file, struct strarray files ) +{ + unsigned int i; + struct strarray spec_args = get_winebuild_args( opts ); + + strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); + strarray_add(&spec_args, "-o"); + strarray_add(&spec_args, output_file); + if (spec_file) + { + strarray_add(&spec_args, "-E"); + strarray_add(&spec_args, spec_file); + } + + /* add resource files */ + for (i = 0; i < files.count; i++) + if (files.str[i][1] == 'r') strarray_add(&spec_args, files.str[i]); + + spawn(opts->prefix, spec_args, 0); +} + static void build(struct options* opts) { struct strarray lib_dirs = empty_strarray; @@ -1246,6 +1269,11 @@ static void build(struct options* opts) else entry_point = opts->entry_point; /* run winebuild to generate the .spec.o file */ + if (opts->data_only) + { + build_data_lib( opts, spec_file, output_file, files ); + return; + } if (spec_file || !opts->unix_lib) spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); @@ -1891,6 +1919,7 @@ int main(int argc, char **argv) struct strarray Wb = strarray_fromstring(opts.args.str[i] + 4, ","); for (j = 0; j < Wb.count; j++) { + if (!strcmp(Wb.str[j], "--data-only")) opts.data_only = 1; if (!strcmp(Wb.str[j], "--fake-module")) opts.fake_module = 1; else strarray_add( &opts.winebuild_args, Wb.str[j] ); }

1 0

Daniel Lehman : msxml3/tests: Fix some double-frees of BSTRs.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 562c16f4215a4ede1295b03df956b49693abc02b URL: https://source.winehq.org/git/wine.git/?a=commit;h=562c16f4215a4ede1295b03d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Feb 15 11:59:31 2022 -0800 msxml3/tests: Fix some double-frees of BSTRs. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ad4d255abe7..f7929cd3a23 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5281,7 +5281,6 @@ static void test_cloneNode(void ) V_VT(&v) = VT_BSTR; hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), v); ok(hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&v); /* clone document node */ hr = IXMLDOMDocument2_cloneNode(doc, VARIANT_TRUE, &node); @@ -8847,7 +8846,6 @@ static void test_put_nodeTypedValue(void) V_BSTR(&value) = _bstr_("1"); hr = IXMLDOMElement_put_nodeTypedValue(elem, value); EXPECT_HR(hr, S_OK); - VariantClear(&value); V_VT(&value) = VT_EMPTY; hr = IXMLDOMElement_get_nodeTypedValue(elem, &value);

1 0