February 2022 - Wine-Commits

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

Feb. 16, 2022

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

Eric Pouech : oledlg: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 189b62723b3457e46bfc51c9ca55ff06edcfa1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=189b62723b3457e46bfc51c9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:34 2022 +0100 oledlg: 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/oledlg/Makefile.in | 1 - dlls/oledlg/oledlg_main.c | 2 +- dlls/oledlg/pastespl.c | 16 ++++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 1d1113a7876..4a16469a456 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = oledlg.dll IMPORTLIB = oledlg IMPORTS = ole32 comdlg32 user32 advapi32 diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index df53ad709ad..33e62f64935 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -84,7 +84,7 @@ static void register_messages(void) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); switch(fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 2593fd559d2..b716036f15f 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -78,7 +78,7 @@ static void dump_ps_flags(DWORD flags) strcat(flagstr, "|"); } } - TRACE("flags %08x %s\n", flags, flagstr); + TRACE("flags %08lx %s\n", flags, flagstr); } static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) @@ -87,7 +87,7 @@ static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) UINT j; dump_ps_flags(ps->dwFlags); - TRACE("hwnd %p caption %s hook %p custdata %lx\n", + TRACE("hwnd %p caption %s hook %p custdata %Ix\n", ps->hWndOwner, debugstr_w(ps->lpszCaption), ps->lpfnHook, ps->lCustData); if(IS_INTRESOURCE(ps->lpszTemplate)) TRACE("hinst %p template %04x hresource %p\n", ps->hInstance, (WORD)(ULONG_PTR)ps->lpszTemplate, ps->hResource); @@ -96,16 +96,16 @@ static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) TRACE("dataobj %p arrpasteent %p cpasteent %d arrlinktype %p clinktype %d\n", ps->lpSrcDataObj, ps->arrPasteEntries, ps->cPasteEntries, ps->arrLinkTypes, ps->cLinkTypes); - TRACE("cclsidex %d lpclsidex %p nselect %d flink %d hmetapict %p size(%d,%d)\n", + TRACE("cclsidex %d lpclsidex %p nselect %d flink %d hmetapict %p size(%ld,%ld)\n", ps->cClsidExclude, ps->lpClsidExclude, ps->nSelectedIndex, ps->fLink, ps->hMetaPict, ps->sizel.cx, ps->sizel.cy); for(i = 0; i < ps->cPasteEntries; i++) { - TRACE("arrPasteEntries[%d]: cFormat %08x pTargetDevice %p dwAspect %d lindex %d tymed %d\n", + TRACE("arrPasteEntries[%d]: cFormat %08x pTargetDevice %p dwAspect %ld lindex %ld tymed %ld\n", i, ps->arrPasteEntries[i].fmtetc.cfFormat, ps->arrPasteEntries[i].fmtetc.ptd, ps->arrPasteEntries[i].fmtetc.dwAspect, ps->arrPasteEntries[i].fmtetc.lindex, ps->arrPasteEntries[i].fmtetc.tymed); - TRACE("\tformat name %s result text %s flags %04x\n", debugstr_w(ps->arrPasteEntries[i].lpstrFormatName), + TRACE("\tformat name %s result text %s flags %04lx\n", debugstr_w(ps->arrPasteEntries[i].lpstrFormatName), debugstr_w(ps->arrPasteEntries[i].lpstrResultText), ps->arrPasteEntries[i].dwFlags); } for(i = 0; i < ps->cLinkTypes; i++) @@ -228,7 +228,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) /* The native version grabs only the first 20 fmts and we do the same */ hr = IEnumFORMATETC_Next(penum, ARRAY_SIZE(fmts), fmts, &fetched); - TRACE("got %d formats hr %08x\n", fetched, hr); + TRACE("got %ld formats hr %08lx\n", fetched, hr); if(SUCCEEDED(hr)) { @@ -271,7 +271,7 @@ static DWORD init_linklist(HWND hdlg, OLEUIPASTESPECIALW *ps) if(hr == S_OK) supported_mask |= 1 << link; } - TRACE("supported_mask %02x\n", supported_mask); + TRACE("supported_mask %02lx\n", supported_mask); for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++) { DWORD linktypes; @@ -515,7 +515,7 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) static const WCHAR prop_name[] = {'W','i','n','e','_','S','t','r','u','c','t','u','r','e',0}; ps_struct_t *ps_struct; - TRACE("(%p, %04x, %08lx, %08lx)\n", hdlg, msg, wp, lp); + TRACE("(%p, %04x, %08Ix, %08Ix)\n", hdlg, msg, wp, lp); ps_struct = GetPropW(hdlg, prop_name);

1 0

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

Feb. 16, 2022

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

Alexandre Julliard : secur32: Add stubs for DeleteSecurityPackageA/W.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

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

Eric Pouech : olesvr32: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

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 : olecli32: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 430c875481b913a0740c9e9eedddf1ccbebbbfe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=430c875481b913a0740c9e9e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:12:16 2022 +0100 olecli32: 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/olecli32/Makefile.in | 1 - dlls/olecli32/olecli_main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in index 54dc54d02ac..0eca46ff269 100644 --- a/dlls/olecli32/Makefile.in +++ b/dlls/olecli32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olecli32.dll IMPORTLIB = olecli32 IMPORTS = ole32 gdi32 diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index ebffc0fda6a..38ffd48b0f0 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -88,7 +88,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC hDoc) { - FIXME("(%d: stub\n", hDoc); + FIXME("(%ld: stub\n", hDoc); return OLE_OK; } @@ -108,7 +108,7 @@ OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname, */ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s,...): stub\n",hDoc, newName); + FIXME("(%ld,%s,...): stub\n",hDoc, newName); return OLE_OK; } @@ -117,7 +117,7 @@ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc) { - FIXME("(%d): stub\n",hServerDoc); + FIXME("(%ld): stub\n",hServerDoc); return OLE_OK; } @@ -128,7 +128,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat ) { - FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", + FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n", name,olecli,hclientdoc,xname,lpoleob,render,clipformat); return OLE_OK; } @@ -137,7 +137,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip( * OleQueryLinkFromClip [OLECLI32.9] */ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { - FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); + FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); return OLE_OK; } @@ -145,7 +145,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFO * OleQueryCreateFromClip [OLECLI32.10] */ OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { - FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); + FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); return OLE_OK; } @@ -185,7 +185,7 @@ OLESTATUS WINAPI OleCreateFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat ) { - FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", + FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n", name,olecli,hclientdoc,xname,lpoleob,render,clipformat); /* clipb type, object kreieren entsprechend etc. */ return OLE_OK;

1 0

Eric Pouech : odbccp32: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: c54cad850bcced6ad8abd11fbabbdbd487770253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c54cad850bcced6ad8abd11f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:58 2022 +0100 odbccp32: 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/odbccp32/Makefile.in | 1 - dlls/odbccp32/odbccp32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in index ec36870b114..77308270728 100644 --- a/dlls/odbccp32/Makefile.in +++ b/dlls/odbccp32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = odbccp32.dll IMPORTLIB = odbccp32 IMPORTS = uuid advapi32 diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 1c46584cd29..131cb158ed6 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -108,7 +108,7 @@ static inline WCHAR *heap_strdupAtoW(const char *str) BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { clear_errors(); - FIXME( "( %d %d %p %p) : stub!\n", i, j, p1, p2); + FIXME( "( %ld %ld %p %p) : stub!\n", i, j, p1, p2); return FALSE; } @@ -977,7 +977,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons /* Store Usage */ size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); for (; *p; p += lstrlenW(p) + 1) { @@ -1399,14 +1399,14 @@ BOOL WINAPI SQLManageDataSources(HWND hwnd) SQLRETURN WINAPI SQLPostInstallerErrorW(DWORD fErrorCode, LPCWSTR szErrorMsg) { - FIXME("%u %s\n", fErrorCode, debugstr_w(szErrorMsg)); + FIXME("%lu %s\n", fErrorCode, debugstr_w(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } SQLRETURN WINAPI SQLPostInstallerError(DWORD fErrorCode, LPCSTR szErrorMsg) { - FIXME("%u %s\n", fErrorCode, debugstr_a(szErrorMsg)); + FIXME("%lu %s\n", fErrorCode, debugstr_a(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1460,7 +1460,7 @@ BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_ size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); count = usagecount - 1; if (count) { @@ -1584,7 +1584,7 @@ BOOL WINAPI SQLRemoveTranslatorW(const WCHAR *translator, DWORD *usage_count) size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); count = usagecount - 1; if (count) {

1 0

Eric Pouech : ntprint: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 06111f34d8fc096beca5e8b610c1acf8fc57004e URL: https://source.winehq.org/git/wine.git/?a=commit;h=06111f34d8fc096beca5e8b6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:46 2022 +0100 ntprint: 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/ntprint/Makefile.in | 1 - dlls/ntprint/ntprint.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index bdfe69a69e6..2ca355140d9 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntprint.dll IMPORTS = winspool diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 6a4cb57c7f6..e89929a0ba1 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -51,7 +51,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server) DWORD needed; DWORD res; - TRACE("(%d, %s)\n", unknown1, debugstr_w(server)); + TRACE("(%ld, %s)\n", unknown1, debugstr_w(server)); mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t)); if (!mi) { @@ -71,7 +71,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server) return NULL; } - TRACE("=> %p (%u monitors installed)\n", mi, mi->installed); + TRACE("=> %p (%lu monitors installed)\n", mi, mi->installed); return mi; } @@ -118,14 +118,14 @@ BOOL WINAPI PSetupEnumMonitor(HANDLE monitorinfo, DWORD index, LPWSTR buffer, LP LPWSTR nameW; DWORD len; - TRACE("(%p, %u, %p, %p) => %d\n", mi, index, buffer, psize, psize ? *psize : 0); + TRACE("(%p, %lu, %p, %p) => %ld\n", mi, index, buffer, psize, psize ? *psize : 0); if (index < mi->installed) { nameW = mi->mi2[index].pName; len = lstrlenW(nameW) + 1; if (len <= *psize) { memcpy(buffer, nameW, len * sizeof(WCHAR)); - TRACE("#%u: %s\n", index, debugstr_w(buffer)); + TRACE("#%lu: %s\n", index, debugstr_w(buffer)); return TRUE; } *psize = len;

1 0

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

Feb. 16, 2022

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 : netprofm: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 228579ec309d0999a8e2c378db49b2dda4c0212e URL: https://source.winehq.org/git/wine.git/?a=commit;h=228579ec309d0999a8e2c378… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:22 2022 +0100 netprofm: 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/netprofm/Makefile.in | 1 - dlls/netprofm/list.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index ebb644c0b4f..c491c483c3a 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netprofm.dll IMPORTS = iphlpapi diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 40d2fd9763c..254cf60c263 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -226,7 +226,7 @@ static HRESULT WINAPI connection_point_Unadvise( struct connection_point *cp = impl_from_IConnectionPoint( iface ); struct sink_entry *iter; - TRACE( "%p, %d\n", cp, cookie ); + TRACE( "%p, %ld\n", cp, cookie ); LIST_FOR_EACH_ENTRY( iter, &cp->sinks, struct sink_entry, entry ) { @@ -779,7 +779,7 @@ static HRESULT WINAPI networks_enum_Next( struct networks_enum *iter = impl_from_IEnumNetworks( iface ); ULONG i = 0; - TRACE( "%p, %u %p %p\n", iter, count, ret, fetched ); + TRACE( "%p, %lu %p %p\n", iter, count, ret, fetched ); if (fetched) *fetched = 0; if (!count) return S_OK; @@ -802,7 +802,7 @@ static HRESULT WINAPI networks_enum_Skip( { struct networks_enum *iter = impl_from_IEnumNetworks( iface ); - TRACE( "%p, %u\n", iter, count); + TRACE( "%p, %lu\n", iter, count); if (!count) return S_OK; if (!iter->cursor) return S_FALSE; @@ -999,7 +999,7 @@ static HRESULT WINAPI connections_enum_Next( struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); ULONG i = 0; - TRACE( "%p, %u %p %p\n", iter, count, ret, fetched ); + TRACE( "%p, %lu %p %p\n", iter, count, ret, fetched ); if (!ret) return E_POINTER; *ret = NULL; @@ -1024,7 +1024,7 @@ static HRESULT WINAPI connections_enum_Skip( { struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); - TRACE( "%p, %u\n", iter, count); + TRACE( "%p, %lu\n", iter, count); if (!count) return S_OK; if (!iter->cursor) return S_FALSE;

1 0