wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : msscript.ocx: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 8ed7c18b88e893f46450783707349bb21a427122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ed7c18b88e893f464507837… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:23 2022 +0100 msscript.ocx: 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/msscript.ocx/Makefile.in | 1 - dlls/msscript.ocx/msscript.c | 152 +++++++++++++++++++++--------------------- 2 files changed, 76 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ed7c18b88e893f46450…

1 0

Eric Pouech : msrle32: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: c003fa9edb7137fbc4973a961bdce09cd74a00f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c003fa9edb7137fbc4973a96… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:17 2022 +0100 msrle32: 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/msrle32/Makefile.in | 1 - dlls/msrle32/msrle32.c | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 50b73374ca6..6368cd8673d 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msrle32.dll IMPORTS = winmm user32 diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index b68a50514f6..d4d7b229282 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1037,7 +1037,7 @@ static LRESULT MSRLE32_DecompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER l break; default: /* absolute mode */ if (pixel_ptr/bytes_per_pixel + code1 > lpbi->biWidth) { - WARN("aborted absolute: (%d=%d/%d+%d) > %d\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); + WARN("aborted absolute: (%d=%d/%d+%d) > %ld\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); return ICERR_ERROR; } extra_byte = code1 & 0x01; @@ -1065,7 +1065,7 @@ static LRESULT MSRLE32_DecompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER l } else { /* coded mode */ if (pixel_ptr/bytes_per_pixel + code0 > lpbi->biWidth) { - WARN("aborted coded: (%d=%d/%d+%d) > %d\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); + WARN("aborted coded: (%d=%d/%d+%d) > %ld\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); return ICERR_ERROR; } @@ -1113,7 +1113,7 @@ static CodecInfo* Open(LPICOPEN icinfo) if (compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return NULL; - TRACE("(%p = {%u,0x%08X(%4.4s),0x%08X(%4.4s),0x%X,0x%X,...})\n", icinfo, + TRACE("(%p = {%lu,0x%08lX(%4.4s),0x%08lX(%4.4s),0x%lX,0x%lX,...})\n", icinfo, icinfo->dwSize, icinfo->fccType, (char*)&icinfo->fccType, icinfo->fccHandler, (char*)&icinfo->fccHandler, icinfo->dwVersion,icinfo->dwFlags); @@ -1128,7 +1128,7 @@ static CodecInfo* Open(LPICOPEN icinfo) icinfo->fccHandler = FOURCC_MRLE; break; default: - WARN("unknown FOURCC = 0x%08X(%4.4s) !\n", + WARN("unknown FOURCC = 0x%08lX(%4.4s) !\n", icinfo->fccHandler,(char*)&icinfo->fccHandler); return NULL; } @@ -1420,7 +1420,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) BOOL is_key; int i; - TRACE("(%p,%p,%u)\n",pi,lpic,dwSize); + TRACE("(%p,%p,%lu)\n",pi,lpic,dwSize); /* pre-condition */ assert(pi != NULL); @@ -1432,7 +1432,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) !lpic->lpbiInput || !lpic->lpInput) return ICERR_BADPARAM; - TRACE("lpic={0x%X,%p,%p,%p,%p,%p,%p,%d,%u,%u,%p,%p}\n",lpic->dwFlags,lpic->lpbiOutput,lpic->lpOutput,lpic->lpbiInput,lpic->lpInput,lpic->lpckid,lpic->lpdwFlags,lpic->lFrameNum,lpic->dwFrameSize,lpic->dwQuality,lpic->lpbiPrev,lpic->lpPrev); + TRACE("lpic={0x%lX,%p,%p,%p,%p,%p,%p,%ld,%lu,%lu,%p,%p}\n",lpic->dwFlags,lpic->lpbiOutput,lpic->lpOutput,lpic->lpbiInput,lpic->lpInput,lpic->lpckid,lpic->lpdwFlags,lpic->lFrameNum,lpic->dwFrameSize,lpic->dwQuality,lpic->lpbiPrev,lpic->lpPrev); if (! pi->bCompress) { LRESULT hr = CompressBegin(pi, lpic->lpbiInput, lpic->lpbiOutput); @@ -1456,13 +1456,13 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) } else if ((lpic->dwFlags & ICCOMPRESS_KEYFRAME) == 0) { LPWORD pTmp; - WARN(": prev=%d cur=%d gone back? -- untested\n",pi->nPrevFrame,lpic->lFrameNum); + WARN(": prev=%ld cur=%ld gone back? -- untested\n",pi->nPrevFrame,lpic->lFrameNum); if (lpic->lpbiPrev == NULL || lpic->lpPrev == NULL) return ICERR_GOTOKEYFRAME; /* Need a keyframe if you go back */ if (CompressQuery(pi, lpic->lpbiPrev, lpic->lpbiOutput) != ICERR_OK) return ICERR_BADFORMAT; - WARN(": prev=%d cur=%d compute swapped -- untested\n",pi->nPrevFrame,lpic->lFrameNum); + WARN(": prev=%ld cur=%ld compute swapped -- untested\n",pi->nPrevFrame,lpic->lFrameNum); computeInternalFrame(pi, lpic->lpbiPrev, lpic->lpPrev); /* swap buffers for current and previous frame */ @@ -1716,7 +1716,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, static LRESULT Decompress(CodecInfo *pi, ICDECOMPRESS *pic, DWORD dwSize) { - TRACE("(%p,%p,%u)\n",pi,pic,dwSize); + TRACE("(%p,%p,%lu)\n",pi,pic,dwSize); /* pre-condition */ assert(pi != NULL); @@ -1811,7 +1811,7 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg, { CodecInfo *pi = (CodecInfo*)dwDrvID; - TRACE("(%lx,%p,0x%04X,0x%08lX,0x%08lX)\n", dwDrvID, hDrv, uMsg, lParam1, lParam2); + TRACE("(%Ix,%p,0x%04X,0x%08IX,0x%08IX)\n", dwDrvID, hDrv, uMsg, lParam1, lParam2); switch (uMsg) { /* standard driver messages */ @@ -1838,7 +1838,7 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg, /* installable compression manager messages */ case ICM_CONFIGURE: - FIXME("ICM_CONFIGURE (%ld)\n",lParam1); + FIXME("ICM_CONFIGURE (%Id)\n",lParam1); if (lParam1 == -1) return ICERR_UNSUPPORTED; /* FIXME */ else @@ -1902,7 +1902,7 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg, if (uMsg < DRV_USER) return DefDriverProc(dwDrvID, hDrv, uMsg, lParam1, lParam2); else - FIXME("Unknown message uMsg=0x%08X lParam1=0x%08lX lParam2=0x%08lX\n",uMsg,lParam1,lParam2); + FIXME("Unknown message uMsg=0x%08X lParam1=0x%08IX lParam2=0x%08IX\n",uMsg,lParam1,lParam2); }; return ICERR_UNSUPPORTED; @@ -1911,7 +1911,7 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg, /* DllMain - library initialization code */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%d,%p)\n",hModule,dwReason,lpReserved); + TRACE("(%p,%ld,%p)\n",hModule,dwReason,lpReserved); switch (dwReason) { case DLL_PROCESS_ATTACH:

1 0

Eric Pouech : mspatcha: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: bd7c0d14db476b76243b9b029668e38a243e1d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7c0d14db476b76243b9b02… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:11 2022 +0100 mspatcha: 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/mspatcha/Makefile.in | 1 - dlls/mspatcha/mspatcha_main.c | 10 +++++----- dlls/mspatcha/pa19.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index 7c09b4c17c3..89d6367b39d 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mspatcha.dll IMPORTLIB = mspatcha diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index c96cb01b549..1f6653da161 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -212,7 +212,7 @@ BOOL WINAPI GetFilePatchSignatureA(LPCSTR filename, ULONG flags, PVOID data, ULO PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) { - FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_a(filename), flags, data, + FIXME("stub - %s, %lx, %p, %lu, %p, %lu, %p, %lu, %p\n", debugstr_a(filename), flags, data, ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -225,7 +225,7 @@ BOOL WINAPI GetFilePatchSignatureW(LPCWSTR filename, ULONG flags, PVOID data, UL PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPWSTR buffer) { - FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_w(filename), flags, data, + FIXME("stub - %s, %lx, %p, %lu, %p, %lu, %p, %lu, %p\n", debugstr_w(filename), flags, data, ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -238,7 +238,7 @@ BOOL WINAPI GetFilePatchSignatureByHandle(HANDLE handle, ULONG flags, PVOID opti PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) { - FIXME("stub - %p, %x, %p, %u, %p, %u, %p, %u, %p\n", handle, flags, options, + FIXME("stub - %p, %lx, %p, %lu, %p, %lu, %p, %lu, %p\n", handle, flags, options, ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -252,7 +252,7 @@ BOOL WINAPI GetFilePatchSignatureByBuffer(PBYTE file_buf, ULONG file_size, ULONG ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) { - FIXME("stub - %p, %u, %x, %p, %u, %p, %u, %p, %u, %p\n", file_buf, file_size, flags, options, + FIXME("stub - %p, %lu, %lx, %p, %lu, %p, %lu, %p, %lu, %p\n", file_buf, file_size, flags, options, ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -265,7 +265,7 @@ INT WINAPI NormalizeFileForPatchSignature(PVOID file_buffer, ULONG file_size, UL ULONG new_coff_base, ULONG new_coff_time, ULONG ignore_range_count, PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, PPATCH_RETAIN_RANGE retain_range) { - FIXME("stub - %p, %u, %x, %p, %u, %u, %u, %p, %u, %p\n", file_buffer, file_size, flags, options, new_coff_base, + FIXME("stub - %p, %lu, %lx, %p, %lu, %lu, %lu, %p, %lu, %p\n", file_buffer, file_size, flags, options, new_coff_base, new_coff_time, ignore_range_count, ignore_range, retain_range_count, retain_range); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c index 0ed60f49815..dc6ef79e2b2 100644 --- a/dlls/mspatcha/pa19.c +++ b/dlls/mspatcha/pa19.c @@ -278,7 +278,7 @@ static int read_header(struct patch_file_header *ph, const BYTE *buf, size_t siz ph->flags = read_raw_uint32(ph); if ((ph->flags & PATCH_OPTION_SUPPORTED_FLAGS) != ph->flags) { - FIXME("unsupported option flag(s): 0x%08x\n", ph->flags & ~PATCH_OPTION_SUPPORTED_FLAGS); + FIXME("unsupported option flag(s): 0x%08lx\n", ph->flags & ~PATCH_OPTION_SUPPORTED_FLAGS); ph->err = ERROR_PATCH_PACKAGE_UNSUPPORTED; return -1; }

1 0

Eric Pouech : msnet32: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 077b5942a935e0ee98356aa5969f1a5a5bfc63af URL: https://source.winehq.org/git/wine.git/?a=commit;h=077b5942a935e0ee98356aa5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:05 2022 +0100 msnet32: 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/msnet32/Makefile.in | 1 - dlls/msnet32/msnet_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in index 7e0ff3918a8..e67f0e73061 100644 --- a/dlls/msnet32/Makefile.in +++ b/dlls/msnet32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msnet32.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index d765c202631..d195a46babe 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -33,6 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msnet); */ LONG WINAPI MSNET32_57( LONG a1, LONG a2, LPVOID a3, LONG a4, LPVOID a5 ) { - FIXME("(0x%04x 0x%04x %p 0x%04x %p): stub\n", a1, a2, a3, a4, a5); + FIXME("(0x%04lx 0x%04lx %p 0x%04lx %p): stub\n", a1, a2, a3, a4, a5); return -1; /* FAILURE */ }

1 0

Eric Pouech : msisip: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 0c34b472128821c71df35a9bba4fb6d4505baded URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c34b472128821c71df35a9b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:00 2022 +0100 msisip: 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/msisip/Makefile.in | 1 - dlls/msisip/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in index c36535ca8aa..3bad02a186a 100644 --- a/dlls/msisip/Makefile.in +++ b/dlls/msisip/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msisip.dll IMPORTS = crypt32 ole32 diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 6324542428a..c5dde262dc2 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -83,7 +83,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, BYTE hdr[2], len[sizeof(DWORD)]; DWORD count, lenBytes, dataBytes; - TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + TRACE("(%p %p %ld %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); r = StgOpenStorage(pSubjectInfo->pwsFileName, NULL, @@ -127,7 +127,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, lenBytes = hdr[1] & 0x7f; if (lenBytes > sizeof(DWORD)) { - WARN("asn.1 length too long (%d)\n", lenBytes); + WARN("asn.1 length too long (%ld)\n", lenBytes); goto freestream; } r = IStream_Read(stm, len, lenBytes, &count);

1 0

Eric Pouech : msimtf: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 095fc3de01cfdfdceec3c35160d4403f8bccff40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=095fc3de01cfdfdceec3c351… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:54 2022 +0100 msimtf: 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/msimtf/Makefile.in | 1 - dlls/msimtf/activeimmapp.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in index e79334679a3..c76c274969c 100644 --- a/dlls/msimtf/Makefile.in +++ b/dlls/msimtf/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msimtf.dll IMPORTS = uuid imm32 diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 5dec79e4b29..9d3318bf017 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -660,7 +660,7 @@ static HRESULT WINAPI ActiveIMMApp_Deactivate(IActiveIMMApp* This) static HRESULT WINAPI ActiveIMMApp_OnDefWindowProc(IActiveIMMApp* This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) { - FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); + FIXME("Stub (%p %x %Ix %Ix)\n",hWnd,Msg,wParam,lParam); return E_FAIL; } @@ -871,7 +871,7 @@ static HRESULT WINAPI ActiveIMMMessagePumpOwner_Resume(IActiveIMMMessagePumpOwne DWORD cookie) { ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); - FIXME("(%p)->(%u): stub\n", This, cookie); + FIXME("(%p)->(%lu): stub\n", This, cookie); return E_NOTIMPL; }

1 0

Eric Pouech : msident: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: ef587a763db2f5b3301a6c6b008a12b2c03cad73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef587a763db2f5b3301a6c6b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:48 2022 +0100 msident: 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/msident/Makefile.in | 1 - dlls/msident/msident.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in index 99040bd9245..d04285aebd6 100644 --- a/dlls/msident/Makefile.in +++ b/dlls/msident/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msident.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 44a65c3e477..2099038ef15 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -63,7 +63,7 @@ static ULONG WINAPI EnumUserIdentity_AddRef(IEnumUserIdentity *iface) EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -73,7 +73,7 @@ static ULONG WINAPI EnumUserIdentity_Release(IEnumUserIdentity *iface) EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -84,14 +84,14 @@ static ULONG WINAPI EnumUserIdentity_Release(IEnumUserIdentity *iface) static HRESULT WINAPI EnumUserIdentity_Next(IEnumUserIdentity *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); - FIXME("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + FIXME("(%p)->(%lu %p %p)\n", This, celt, rgelt, pceltFetched); return E_NOTIMPL; } static HRESULT WINAPI EnumUserIdentity_Skip(IEnumUserIdentity *iface, ULONG celt) { EnumUserIdentity *This = impl_from_IEnumUserIdentity(iface); - FIXME("(%p)->(%u)\n", This, celt); + FIXME("(%p)->(%lu)\n", This, celt); return E_NOTIMPL; } @@ -179,14 +179,14 @@ static HRESULT WINAPI UserIdentityManager_EnumIdentities(IUserIdentityManager *i static HRESULT WINAPI UserIdentityManager_ManageIdentities(IUserIdentityManager *iface, HWND hwndParent, DWORD dwFlags) { - FIXME("(%p %x)\n", hwndParent, dwFlags); + FIXME("(%p %lx)\n", hwndParent, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI UserIdentityManager_Logon(IUserIdentityManager *iface, HWND hwndParent, DWORD dwFlags, IUserIdentity **ppIdentity) { - FIXME("(%p %x %p)\n", hwndParent, dwFlags, ppIdentity); + FIXME("(%p %lx %p)\n", hwndParent, dwFlags, ppIdentity); return E_USER_CANCELLED; }

1 0

Eric Pouech : msdmo: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: a43a17787e84e87b2d07bded617acad4092e9b1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a43a17787e84e87b2d07bded… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:23 2022 +0100 msdmo: 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/msdmo/Makefile.in | 1 - dlls/msdmo/dmoreg.c | 22 +++++++++++----------- dlls/msdmo/dmort.c | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index ed4bcfae6f0..566461e00bf 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msdmo.dll IMPORTLIB = msdmo IMPORTS = dmoguids uuid ole32 user32 advapi32 diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index d5c76c8273f..70f01661697 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -204,7 +204,7 @@ lend: RegCloseKey(hrkey); hres = HRESULT_FROM_WIN32(ret); - TRACE(" hresult=0x%08x\n", hres); + TRACE(" hresult=0x%08lx\n", hres); return hres; } @@ -398,7 +398,7 @@ static ULONG WINAPI IEnumDMO_fnAddRef(IEnumDMO * iface) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, refCount); + TRACE("(%p)->(%ld)\n", This, refCount); return refCount; } @@ -431,7 +431,7 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) IEnumDMOImpl *This = impl_from_IEnumDMO(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, refCount); + TRACE("(%p)->(%ld)\n", This, refCount); if (!refCount) { @@ -483,7 +483,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( IEnumDMOImpl *This = impl_from_IEnumDMO(iface); - TRACE("(%p)->(%d %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched); + TRACE("(%p)->(%ld %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched); if (!pCLSID) return E_POINTER; @@ -550,7 +550,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( } for (i = 0; i < size / sizeof(DMO_PARTIAL_MEDIATYPE); ++i) - TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), + TRACE("intype %ld: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), debugstr_guid(&types[i].subtype)); if (!any_types_match(types, size / sizeof(DMO_PARTIAL_MEDIATYPE), This->pInTypes, This->cInTypes)) @@ -586,7 +586,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( } for (i = 0; i < size / sizeof(DMO_PARTIAL_MEDIATYPE); ++i) - TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), + TRACE("outtype %ld: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), debugstr_guid(&types[i].subtype)); if (!any_types_match(types, size / sizeof(DMO_PARTIAL_MEDIATYPE), This->pOutTypes, This->cOutTypes)) @@ -633,7 +633,7 @@ static HRESULT WINAPI IEnumDMO_fnSkip(IEnumDMO * iface, DWORD cItemsToSkip) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); - TRACE("(%p)->(%d)\n", This, cItemsToSkip); + TRACE("(%p)->(%ld)\n", This, cItemsToSkip); This->index += cItemsToSkip; return S_OK; @@ -680,7 +680,7 @@ HRESULT WINAPI DMOEnum( const DMO_PARTIAL_MEDIATYPE *pOutTypes, IEnumDMO **ppEnum) { - TRACE("%s 0x%08x %d %p %d %p %p\n", debugstr_guid(category), flags, cInTypes, pInTypes, + TRACE("%s 0x%08lx %ld %p %ld %p %p\n", debugstr_guid(category), flags, cInTypes, pInTypes, cOutTypes, pOutTypes, ppEnum); if (TRACE_ON(msdmo)) @@ -689,13 +689,13 @@ HRESULT WINAPI DMOEnum( if (cInTypes) { for (i = 0; i < cInTypes; i++) - TRACE("intype %d - type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), + TRACE("intype %ld - type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), debugstr_guid(&pInTypes[i].subtype)); } if (cOutTypes) { for (i = 0; i < cOutTypes; i++) - TRACE("outtype %d - type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), + TRACE("outtype %ld - type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), debugstr_guid(&pOutTypes[i].subtype)); } } @@ -727,7 +727,7 @@ HRESULT WINAPI DMOGetTypes(REFCLSID clsid, ULONG input_count, ULONG *ret_input_c LSTATUS ret; DWORD size; - TRACE("clsid %s, input_count %u, ret_input_count %p, input %p, output_count %u, ret_output_count %p, output %p.\n", + TRACE("clsid %s, input_count %lu, ret_input_count %p, input %p, output_count %lu, ret_output_count %p, output %p.\n", debugstr_guid(clsid), input_count, ret_input_count, input, output_count, ret_output_count, output); if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"DirectShow\\MediaObjects", 0, KEY_READ, &root)) diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c index b586cac6116..04e2617ccca 100644 --- a/dlls/msdmo/dmort.c +++ b/dlls/msdmo/dmort.c @@ -39,7 +39,7 @@ HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat) { HRESULT r; - TRACE("%p %u\n", ppmedia, cbFormat); + TRACE("%p %lu\n", ppmedia, cbFormat); if (!ppmedia) return E_POINTER; @@ -65,7 +65,7 @@ HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat) */ HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat) { - TRACE("%p %u\n", pmedia, cbFormat); + TRACE("%p %lu\n", pmedia, cbFormat); if (!pmedia) return E_POINTER;

1 0

Eric Pouech : msdaps: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: c7875729879d87d1ad1d81fab9bc03309e11c0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7875729879d87d1ad1d81fa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:17 2022 +0100 msdaps: 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/msdaps/Makefile.in | 1 - dlls/msdaps/row_server.c | 92 +++++++++++----------- dlls/msdaps/usrmarshal.c | 200 +++++++++++++++++++++++------------------------ 3 files changed, 146 insertions(+), 147 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7875729879d87d1ad1d…

1 0

Eric Pouech : msctfmonitor: Enable compilation with long types.
by Alexandre Julliard 15 Feb '22

15 Feb '22

Module: wine Branch: master Commit: 7c73ffc643f7c42972cb96c50daff52f511bf8a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c73ffc643f7c42972cb96c5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:11 2022 +0100 msctfmonitor: 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/msctfmonitor/Makefile.in | 1 - dlls/msctfmonitor/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msctfmonitor/Makefile.in b/dlls/msctfmonitor/Makefile.in index 356f0ca1ce1..dd58e9fb0f6 100644 --- a/dlls/msctfmonitor/Makefile.in +++ b/dlls/msctfmonitor/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msctfmonitor.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msctfmonitor/main.c b/dlls/msctfmonitor/main.c index f609c1a1a25..3116fde1293 100644 --- a/dlls/msctfmonitor/main.c +++ b/dlls/msctfmonitor/main.c @@ -22,6 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfmonitor); HRESULT WINAPI InitLocalMsCtfMonitor(DWORD flags) { - FIXME("%d stub!\n", flags); + FIXME("%ld stub!\n", flags); return E_FAIL; }

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