February 2022 - Wine-commits

Eric Pouech : dsdmo: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 97e6f05caf723e4f642ece420418adca0e61b616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97e6f05caf723e4f642ece42… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:32 2022 +0100 dsdmo: 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/dsdmo/Makefile.in | 1 - dlls/dsdmo/main.c | 44 ++++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 38bd6a7ad0f..a3dd1ad11e9 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsdmo.dll IMPORTS = dmoguids strmiids uuid diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index fa39c28abd7..fe7cf1115a7 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -81,7 +81,7 @@ static ULONG WINAPI effect_inner_AddRef(IUnknown *iface) struct effect *effect = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&effect->refcount); - TRACE("%p increasing refcount to %u.\n", effect, refcount); + TRACE("%p increasing refcount to %lu.\n", effect, refcount); return refcount; } @@ -90,7 +90,7 @@ static ULONG WINAPI effect_inner_Release(IUnknown *iface) struct effect *effect = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&effect->refcount); - TRACE("%p decreasing refcount to %u.\n", effect, refcount); + TRACE("%p decreasing refcount to %lu.\n", effect, refcount); if (!refcount) { @@ -139,25 +139,25 @@ static HRESULT WINAPI effect_GetStreamCount(IMediaObject *iface, DWORD *input, D static HRESULT WINAPI effect_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + FIXME("iface %p, index %lu, type_index %lu, type %p, stub!\n", iface, index, type_index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + FIXME("iface %p, index %lu, type_index %lu, type %p, stub!\n", iface, index, type_index, type); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, cons struct effect *effect = impl_from_IMediaObject(iface); const WAVEFORMATEX *format; - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -227,7 +227,7 @@ static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, con struct effect *effect = impl_from_IMediaObject(iface); HRESULT hr; - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) return S_OK; @@ -251,38 +251,38 @@ static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, con static HRESULT WINAPI effect_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + FIXME("iface %p, index %lu, type %p, stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + FIXME("iface %p, index %lu, type %p, stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *lookahead, DWORD *alignment) { - FIXME("iface %p, index %u, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); + FIXME("iface %p, index %lu, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) { - FIXME("iface %p, index %u, size %p, alignment %p, stub!\n", iface, index, size, alignment); + FIXME("iface %p, index %lu, size %p, alignment %p, stub!\n", iface, index, size, alignment); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) { - FIXME("iface %p, index %u, latency %p, stub!\n", iface, index, latency); + FIXME("iface %p, index %lu, latency %p, stub!\n", iface, index, latency); return E_NOTIMPL; } static HRESULT WINAPI effect_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) { - FIXME("iface %p, index %u, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); + FIXME("iface %p, index %lu, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); return E_NOTIMPL; } @@ -294,7 +294,7 @@ static HRESULT WINAPI effect_Flush(IMediaObject *iface) static HRESULT WINAPI effect_Discontinuity(IMediaObject *iface, DWORD index) { - FIXME("iface %p, index %u, stub!\n", iface, index); + FIXME("iface %p, index %lu, stub!\n", iface, index); return E_NOTIMPL; } @@ -312,14 +312,14 @@ static HRESULT WINAPI effect_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI effect_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) { - FIXME("iface %p, index %u, buffer %p, flags %#x, timestamp %s, timelength %s, stub!\n", + FIXME("iface %p, index %lu, buffer %p, flags %#lx, timestamp %s, timelength %s, stub!\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); return E_NOTIMPL; } @@ -327,13 +327,13 @@ static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, static HRESULT WINAPI effect_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - FIXME("iface %p, flags %#x, count %u, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); + FIXME("iface %p, flags %#lx, count %lu, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); return E_NOTIMPL; } static HRESULT WINAPI effect_Lock(IMediaObject *iface, LONG lock) { - FIXME("iface %p, lock %d, stub!\n", iface, lock); + FIXME("iface %p, lock %ld, stub!\n", iface, lock); return E_NOTIMPL; } @@ -391,7 +391,7 @@ static ULONG WINAPI effect_inplace_Release(IMediaObjectInPlace *iface) static HRESULT WINAPI effect_inplace_Process(IMediaObjectInPlace *iface, ULONG size, BYTE *data, REFERENCE_TIME start, DWORD flags) { - FIXME("iface %p, size %u, data %p, start %s, flags %#x, stub!\n", + FIXME("iface %p, size %lu, data %p, start %s, flags %#lx, stub!\n", iface, size, data, wine_dbgstr_longlong(start), flags); return E_NOTIMPL; } @@ -599,7 +599,7 @@ static HRESULT WINAPI reverb_params_SetPreset(IDirectSoundFXI3DL2Reverb *iface, { struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); - FIXME("effect %p, preset %u, stub!\n", effect, preset); + FIXME("effect %p, preset %lu, stub!\n", effect, preset); return E_NOTIMPL; } @@ -617,7 +617,7 @@ static HRESULT WINAPI reverb_params_SetQuality(IDirectSoundFXI3DL2Reverb *iface, { struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); - FIXME("effect %p, quality %u, stub!\n", effect, quality); + FIXME("effect %p, quality %lu, stub!\n", effect, quality); return E_NOTIMPL; }

1 0

Eric Pouech : dsquery: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: f72d53fce0a968bfffb410b903a727cda148e782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72d53fce0a968bfffb410b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:44 2022 +0100 dsquery: 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/dsquery/Makefile.in | 1 - dlls/dsquery/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index 757d62b006b..611e6011575 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsquery.dll IMPORTS = uuid diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c index 545ec36f321..06fe1e6e5f5 100644 --- a/dlls/dsquery/main.c +++ b/dlls/dsquery/main.c @@ -66,7 +66,7 @@ static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) struct query_class_factory *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) increasing refcount to %u\n", iface, ref); + TRACE("(%p) increasing refcount to %lu\n", iface, ref); return ref; } @@ -76,7 +76,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) struct query_class_factory *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) decreasing refcount to %u\n", iface, ref); + TRACE("(%p) decreasing refcount to %lu\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -144,7 +144,7 @@ static ULONG WINAPI CommonQuery_AddRef(ICommonQuery *iface) struct common_query *This = impl_from_ICommonQuery(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) increasing refcount to %u\n", iface, ref); + TRACE("(%p) increasing refcount to %lu\n", iface, ref); return ref; } @@ -154,7 +154,7 @@ static ULONG WINAPI CommonQuery_Release(ICommonQuery *iface) struct common_query *This = impl_from_ICommonQuery(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) decreasing refcount to %u\n", iface, ref); + TRACE("(%p) decreasing refcount to %lu\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This);

1 0

Eric Pouech : dssenh: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 7f3c35db707fcce64db877765f232aa705ef76e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f3c35db707fcce64db87776… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:50 2022 +0100 dssenh: 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/dssenh/Makefile.in | 1 - dlls/dssenh/main.c | 56 ++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f3c35db707fcce64db8…

1 0

Eric Pouech : dsuiext: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 37b972c70d2a6c13c6e570b917c6c1125a7fb374 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b972c70d2a6c13c6e570b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:56 2022 +0100 dsuiext: 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/dsuiext/Makefile.in | 1 - dlls/dsuiext/dsuiext.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dsuiext/Makefile.in b/dlls/dsuiext/Makefile.in index da0ee1f37b2..d3d663bf0c3 100644 --- a/dlls/dsuiext/Makefile.in +++ b/dlls/dsuiext/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsuiext.dll IMPORTS = ole32 uuid diff --git a/dlls/dsuiext/dsuiext.c b/dlls/dsuiext/dsuiext.c index fc16bf90bbf..762f7596e73 100644 --- a/dlls/dsuiext/dsuiext.c +++ b/dlls/dsuiext/dsuiext.c @@ -85,7 +85,7 @@ static ULONG WINAPI dispspec_Release(IDsDisplaySpecifier *iface) static HRESULT WINAPI dispspec_SetServer(IDsDisplaySpecifier *iface, LPCWSTR server, LPCWSTR user, LPCWSTR password, DWORD flags) { - FIXME("%p,%s,%s,%p,%08x: stub\n", iface, debugstr_w(server), debugstr_w(user), password, flags); + FIXME("%p,%s,%s,%p,%08lx: stub\n", iface, debugstr_w(server), debugstr_w(user), password, flags); return E_NOTIMPL; } @@ -105,14 +105,14 @@ static HRESULT WINAPI dispspec_GetDisplaySpecifier(IDsDisplaySpecifier *iface, L static HRESULT WINAPI dispspec_GetIconLocation(IDsDisplaySpecifier *iface, LPCWSTR object, DWORD flags, LPWSTR buffer, INT size, INT *id) { - FIXME("%p,%s,%08x,%p,%d,%p: stub\n", iface, debugstr_w(object), flags, buffer, size, id); + FIXME("%p,%s,%08lx,%p,%d,%p: stub\n", iface, debugstr_w(object), flags, buffer, size, id); return E_NOTIMPL; } static HICON WINAPI dispspec_GetIcon(IDsDisplaySpecifier *iface, LPCWSTR object, DWORD flags, INT cx, INT cy) { - FIXME("%p,%s,%08x,%dx%d: stub\n", iface, debugstr_w(object), flags, cx, cy); + FIXME("%p,%s,%08lx,%dx%d: stub\n", iface, debugstr_w(object), flags, cx, cy); return 0; } @@ -133,7 +133,7 @@ static HRESULT WINAPI dispspec_GetFriendlyAttributeName(IDsDisplaySpecifier *ifa static BOOL WINAPI dispspec_IsClassContainer(IDsDisplaySpecifier *iface, LPCWSTR object, LPCWSTR path, DWORD flags) { - FIXME("%p,%s,%s,%08x: stub\n", iface, debugstr_w(object), debugstr_w(path), flags); + FIXME("%p,%s,%s,%08lx: stub\n", iface, debugstr_w(object), debugstr_w(path), flags); return FALSE; } @@ -147,7 +147,7 @@ static HRESULT WINAPI dispspec_GetClassCreationInfo(IDsDisplaySpecifier *iface, static HRESULT WINAPI dispspec_EnumClassAttributes(IDsDisplaySpecifier *iface, LPCWSTR object, LPDSENUMATTRIBUTES cb, LPARAM param) { - FIXME("%p,%s,%p,%08lx: stub\n", iface, debugstr_w(object), cb, param); + FIXME("%p,%s,%p,%08Ix: stub\n", iface, debugstr_w(object), cb, param); return E_NOTIMPL; } @@ -237,7 +237,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; } @@ -247,7 +247,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 : dwmapi: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 96aa7bcd7b86fa9ebb2460f14122913365ec5b09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96aa7bcd7b86fa9ebb2460f1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:02 2022 +0100 dwmapi: 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/dwmapi/Makefile.in | 1 - dlls/dwmapi/dwmapi_main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index 4891fab88b1..e63dbc2ea00 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dwmapi.dll IMPORTLIB = dwmapi diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6a66aa51dad..cec20220ec2 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -115,7 +115,7 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr { static BOOL once; - if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); + if (!once++) FIXME("(%p, %lx, %p, %lx) stub\n", hwnd, attributenum, attribute, size); return S_OK; } @@ -197,7 +197,7 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, */ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) { - FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); + FIXME("(%p %ld %p %ld) stub\n", hwnd, attribute, pv_attribute, size); return E_NOTIMPL; } @@ -265,7 +265,7 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params */ HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos, DWORD flags) { - FIXME("(%p %p %p %x) stub\n", hwnd, hbmp, pos, flags); + FIXME("(%p %p %p %lx) stub\n", hwnd, hbmp, pos, flags); return S_OK; }; @@ -274,7 +274,7 @@ HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos */ HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) { - FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags); + FIXME("(%p %p %lx) stub\n", hwnd, hbmp, flags); return S_OK; };

1 0

Eric Pouech : dxdiagn: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 1cc1ecf5747ffc39d7fe116048f08a27f81bcd80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc1ecf5747ffc39d7fe1160… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:14 2022 +0100 dxdiagn: 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/dxdiagn/Makefile.in | 1 - dlls/dxdiagn/container.c | 8 ++++---- dlls/dxdiagn/dxdiag_main.c | 2 +- dlls/dxdiagn/provider.c | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index 218b77f9ff5..127981e8183 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxdiagn.dll IMPORTS = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32 diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 7a5a7e9d0a5..efc8cba448e 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -56,7 +56,7 @@ static ULONG WINAPI IDxDiagContainerImpl_AddRef(IDxDiagContainer *iface) IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); DXDIAGN_LockModule(); @@ -68,7 +68,7 @@ static ULONG WINAPI IDxDiagContainerImpl_Release(IDxDiagContainer *iface) IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); if (!refCount) { IDxDiagProvider_Release(This->pProv); @@ -101,7 +101,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(IDxDiagContai IDxDiagContainerImpl_Container *p; DWORD i = 0; - TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszContainer, cchContainer); + TRACE("(%p, %lu, %p, %lu)\n", iface, dwIndex, pwszContainer, cchContainer); if (NULL == pwszContainer || 0 == cchContainer) { return E_INVALIDARG; @@ -214,7 +214,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(IDxDiagContainer *iface IDxDiagContainerImpl_Property *p; DWORD i = 0; - TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszPropName, cchPropName); + TRACE("(%p, %lu, %p, %lu)\n", iface, dwIndex, pwszPropName, cchPropName); if (NULL == pwszPropName || 0 == cchPropName) { return E_INVALIDARG; diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 0f57b94281f..90e769cd81f 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -42,7 +42,7 @@ LONG DXDIAGN_refCount = 0; /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hInstDLL, fdwReason, lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) { dxdiagn_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index aaffb5c213d..8479d59fefe 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -84,7 +84,7 @@ static ULONG WINAPI IDxDiagProviderImpl_AddRef(IDxDiagProvider *iface) IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); DXDIAGN_LockModule(); @@ -96,7 +96,7 @@ static ULONG WINAPI IDxDiagProviderImpl_Release(IDxDiagProvider *iface) IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); if (!refCount) { free_information_tree(This->info_root); @@ -825,7 +825,7 @@ static const WCHAR *vendor_id_to_manufacturer_string(DWORD vendor_id) return vendors[i].name; } - FIXME("Unknown PCI vendor ID 0x%04x.\n", vendor_id); + FIXME("Unknown PCI vendor ID 0x%04lx.\n", vendor_id); return L"Unknown"; }

1 0

Eric Pouech : explorerframe: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: e3213978d3f388f09bb0981289285f64886cca75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3213978d3f388f09bb09812… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:20 2022 +0100 explorerframe: 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/explorerframe/Makefile.in | 1 - dlls/explorerframe/explorerframe_main.c | 4 +-- dlls/explorerframe/nstc.c | 46 ++++++++++++++++----------------- dlls/explorerframe/taskbarlist.c | 6 ++--- 4 files changed, 28 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3213978d3f388f09bb0…

1 0

Eric Pouech : faultrep: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 9173eeaa86d198bac0193a7fd03b02b9bf5c3796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9173eeaa86d198bac0193a7f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:25 2022 +0100 faultrep: 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/faultrep/Makefile.in | 1 - dlls/faultrep/faultrep.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in index b28485eb9d8..9e054425781 100644 --- a/dlls/faultrep/Makefile.in +++ b/dlls/faultrep/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = faultrep.dll IMPORTLIB = faultrep IMPORTS = advapi32 diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index e45f3e0a2d1..b9207426970 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -100,6 +100,6 @@ BOOL WINAPI AddERExcludedApplicationA(LPCSTR lpAppFileName) */ EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS pep, DWORD dwOpt) { - FIXME("%p 0x%x stub\n", pep, dwOpt); + FIXME("%p 0x%lx stub\n", pep, dwOpt); return frrvOk; }

1 0

Francois Gouget : testbot/LibvirtTool: Avoid a race between shutdown.exe and TestAgentd.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: tools Branch: master Commit: 122e1af344c8d333b6d6414a3aba5687e3c13fce URL: https://source.winehq.org/git/tools.git/?a=commit;h=122e1af344c8d333b6d6414… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 10 19:51:55 2022 +0100 testbot/LibvirtTool: Avoid a race between shutdown.exe and TestAgentd. "shutdown.exe /p" waits for no process which may give it a slight edge in not getting stuck; but it also does not wait for TestAgentd to reply to the Run() RPC. "shutdown.exe /s" does not seem to have this problem (and supports /t if need be). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4b84f9b..0cccd12 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -292,7 +292,7 @@ sub ShutDown() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/p", "/d", "00:00"] : + ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : ["/sbin/shutdown", "--poweroff", "now"]; Debug(Elapsed($Start), " Running @$Cmd\n"); my $PTA = GetPrivilegedTA($VM->GetAgent());

1 0

Francois Gouget : testbot/VMs: Set the default VM type to win64.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: tools Branch: master Commit: a9aa24938b78d0990a9ec13b218103f763ba2ea1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a9aa24938b78d0990a9ec13… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 10 02:11:55 2022 +0100 testbot/VMs: Set the default VM type to win64. This is only relevant when creating a new VM and the most commonly created VM type is 64-bit Windows VMs (for the various locales). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 0b11d81..596499a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -171,6 +171,7 @@ sub InitializeNew($$) my ($self, $Collection) = @_; $self->Status("off"); + $self->Type("win64"); $self->IdleSnapshot("base-live"); $self->SUPER::InitializeNew($Collection);

1 0