February 2022 - Wine-Commits

Rémi Bernon : dinput: Cleanup IDirectInput8W names and traces.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 73ba9d34597dadafefbabf20bba43cdfd07a4965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ba9d34597dadafefbabf20… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:29 2022 +0100 dinput: Cleanup IDirectInput8W names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 157 ++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73ba9d34597dadafefba…

1 0

Rémi Bernon : dinput: Cleanup IDirectInput7W names and traces.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: d33103bf0577dc7a76791bafd23b150e44a1a832 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33103bf0577dc7a76791baf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:28 2022 +0100 dinput: Cleanup IDirectInput7W names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 184 ++++++++++++++++++++++------------------------ 1 file changed, 86 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d33103bf0577dc7a7679…

1 0

Rémi Bernon : dinput: Cleanup IDirectInputJoyConfig8 names and traces.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 44f7ccfcd19be8fea74ba4099796a1a676ed3d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f7ccfcd19be8fea74ba409… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:27 2022 +0100 dinput: Cleanup IDirectInputJoyConfig8 names and traces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 137 +++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44f7ccfcd19be8fea74b…

1 0

Eric Pouech : wuauserv: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 2e11d97390ddbd52aa0b9ed9a3435e11eebfefe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e11d97390ddbd52aa0b9ed9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:44 2022 +0100 wuauserv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wuauserv/Makefile.in | 1 - programs/wuauserv/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wuauserv/Makefile.in b/programs/wuauserv/Makefile.in index 1e936127167..6bfaf71ddf4 100644 --- a/programs/wuauserv/Makefile.in +++ b/programs/wuauserv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wuauserv.exe IMPORTS = advapi32 diff --git a/programs/wuauserv/main.c b/programs/wuauserv/main.c index 8b360131112..79eb84e6703 100644 --- a/programs/wuauserv/main.c +++ b/programs/wuauserv/main.c @@ -53,7 +53,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + WINE_FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR;

1 0

Zhiyi Zhang : comctl32/treeview: Support HiDPI for unthemed item check boxes.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 35ed21d27aa23fb318a00a769b945f48193f23a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ed21d27aa23fb318a00a76… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 7 16:09:45 2022 +0800 comctl32/treeview: Support HiDPI for unthemed item check boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 608ce489e33..e9e2cb37d47 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3011,30 +3011,34 @@ static BOOL TREEVIEW_InitThemedCheckboxes(TREEVIEW_INFO *info) static void TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { + int nIndex, width, height; RECT rc; HBITMAP hbm, hbmOld; HDC hdc, hdcScreen; - int nIndex; if (TREEVIEW_InitThemedCheckboxes(infoPtr)) return; - infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + width = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + height = width; + infoPtr->himlState = ImageList_Create(width, height, ILC_COLOR | ILC_MASK, 3, 0); hdcScreen = GetDC(0); hdc = CreateCompatibleDC(hdcScreen); - hbm = CreateCompatibleBitmap(hdcScreen, 48, 16); + hbm = CreateCompatibleBitmap(hdcScreen, width * 3, height); hbmOld = SelectObject(hdc, hbm); - SetRect(&rc, 0, 0, 48, 16); + SetRect(&rc, 0, 0, width * 3, height); FillRect(hdc, &rc, (HBRUSH)(COLOR_WINDOW+1)); - SetRect(&rc, 18, 2, 30, 14); + rc.left = width; + rc.right = rc.left + width; DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK|DFCS_FLAT); - SetRect(&rc, 34, 2, 46, 14); + rc.left = width * 2; + rc.right = rc.left + width; DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); @@ -3047,8 +3051,8 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) DeleteDC(hdc); ReleaseDC(0, hdcScreen); - infoPtr->stateImageWidth = 16; - infoPtr->stateImageHeight = 16; + infoPtr->stateImageWidth = width; + infoPtr->stateImageHeight = height; } static void

1 0

Zhiyi Zhang : comctl32/treeview: Use DFCS_MONO style for item check boxes.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: e82d96ed5edaae67060ae9ac993dd29dca166ee0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e82d96ed5edaae67060ae9ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 7 16:10:04 2022 +0800 comctl32/treeview: Use DFCS_MONO style for item check boxes. Keep it consistent with Windows. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e9e2cb37d47..d00bba8e625 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3034,13 +3034,11 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) rc.left = width; rc.right = rc.left + width; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT); + DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO); rc.left = width * 2; rc.right = rc.left + width; - DrawFrameControl(hdc, &rc, DFC_BUTTON, - DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED); + DrawFrameControl(hdc, &rc, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_MONO | DFCS_CHECKED); SelectObject(hdc, hbmOld); nIndex = ImageList_AddMasked(infoPtr->himlState, hbm,

1 0

Rémi Bernon : dinput: Cleanup DllGetClassObject and IClassFactory implementation.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: ac7ff2611d418ea40bfa6cbf4c92bd793b2e4349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac7ff2611d418ea40bfa6cbf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:23:26 2022 +0100 dinput: Cleanup DllGetClassObject and IClassFactory implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 121 +++++++++++++++++++++++---------------------- dlls/dinput/tests/dinput.c | 1 - 2 files changed, 63 insertions(+), 59 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index dbb727c3c43..2172eb32ee9 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1089,90 +1089,95 @@ static const IDirectInputJoyConfig8Vtbl JoyConfig8vt = JoyConfig8Impl_OpenAppStatusKey }; -/******************************************************************************* - * DirectInput ClassFactory - */ -typedef struct +struct class_factory { - /* IUnknown fields */ IClassFactory IClassFactory_iface; - LONG ref; -} IClassFactoryImpl; +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface ) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface ); } -static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); +static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface, REFIID iid, void **out ) +{ + struct class_factory *impl = impl_from_IClassFactory(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IClassFactory)) + *out = &impl->IClassFactory_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } -static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - return InterlockedIncrement(&(This->ref)); +static ULONG WINAPI class_factory_AddRef( IClassFactory *iface ) +{ + return 2; } -static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - /* static class, won't be freed */ - return InterlockedDecrement(&(This->ref)); +static ULONG WINAPI class_factory_Release( IClassFactory *iface ) +{ + return 1; } -static HRESULT WINAPI DICF_CreateInstance( - LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj -) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); +static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnknown *outer, REFIID iid, void **out ) +{ + IUnknown *unknown; + HRESULT hr; - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - if ( IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IDirectInputA, riid ) || - IsEqualGUID( &IID_IDirectInputW, riid ) || - IsEqualGUID( &IID_IDirectInput2A, riid ) || - IsEqualGUID( &IID_IDirectInput2W, riid ) || - IsEqualGUID( &IID_IDirectInput7A, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid ) || - IsEqualGUID( &IID_IDirectInput8A, riid ) || - IsEqualGUID( &IID_IDirectInput8W, riid ) ) - { - return create_directinput_instance(riid, ppobj, NULL); - } + TRACE( "iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid( iid ), out ); + + if (outer) return CLASS_E_NOAGGREGATION; - FIXME("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; + if (FAILED(hr = create_directinput_instance( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + + return hr; } -static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d),stub!\n",This,dolock); - return S_OK; +static HRESULT WINAPI class_factory_LockServer( IClassFactory *iface, BOOL lock ) +{ + FIXME( "iface %p, lock %d stub!\n", iface, lock ); + return S_OK; } -static const IClassFactoryVtbl DICF_Vtbl = { - DICF_QueryInterface, - DICF_AddRef, - DICF_Release, - DICF_CreateInstance, - DICF_LockServer +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, }; -static IClassFactoryImpl DINPUT_CF = {{&DICF_Vtbl}, 1 }; + +static struct class_factory class_factory = {{&class_factory_vtbl}}; /*********************************************************************** * DllGetClassObject (DINPUT.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **out ) { - TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = &DINPUT_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } + TRACE( "clsid %s, iid %s, out %p.\n", debugstr_guid( clsid ), debugstr_guid( iid ), out ); + +#if DIRECTINPUT_VERSION == 0x0700 + if (IsEqualCLSID( &CLSID_DirectInput, clsid )) + return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); +#else + if (IsEqualCLSID( &CLSID_DirectInput8, clsid )) + return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); +#endif - FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + WARN( "%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid( clsid ) ); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index a2c7f5dbd8d..0b3ce276e52 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -167,7 +167,6 @@ static void test_CoCreateInstance( DWORD version ) &IID_IDirectInputA, (void **)&unknown ); else hr = CoCreateInstance( &CLSID_DirectInput8, &outer, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (void **)&unknown ); - todo_wine ok( hr == CLASS_E_NOAGGREGATION, "CoCreateInstance returned %#x\n", hr ); if (SUCCEEDED( hr )) IUnknown_Release( unknown );

1 0

Eric Pouech : xcopy: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 7dc8e9edc27d74f1820946231bb50a0ec9204a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dc8e9edc27d74f182094623… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:56 2022 +0100 xcopy: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/Makefile.in | 1 - programs/xcopy/xcopy.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index f51370405da..b22ff7814ec 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xcopy.exe IMPORTS = shell32 user32 diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 809f24433a3..0f46a6c42ab 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -79,7 +79,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, L"Failed!"); } return msg; @@ -121,7 +121,7 @@ static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); va_end(parms); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0; } @@ -178,7 +178,7 @@ static void XCOPY_FailMessage(DWORD err) { NULL, err, 0, (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { - WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", + WINE_FIXME("FIXME: Cannot display message for error %ld, status %ld\n", err, GetLastError()); } else { XCOPY_wprintf(L"%1\n", lpMsgBuf); @@ -397,7 +397,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* See if allowed to copy it */ srcAttribs = GetFileAttributesW(copyFrom); - WINE_TRACE("Source attribs: %d\n", srcAttribs); + WINE_TRACE("Source attribs: %ld\n", srcAttribs); if ((srcAttribs & FILE_ATTRIBUTE_HIDDEN) || (srcAttribs & FILE_ATTRIBUTE_SYSTEM)) { @@ -414,7 +414,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* See if file exists */ destAttribs = GetFileAttributesW(copyTo); - WINE_TRACE("Dest attribs: %d\n", srcAttribs); + WINE_TRACE("Dest attribs: %ld\n", srcAttribs); /* Check date ranges if a destination file already exists */ if (!skipFile && (flags & OPT_DATERANGE) && @@ -901,7 +901,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, * Validate the source, expanding to full path ensuring it exists */ if (GetFullPathNameW(suppliedsource, MAX_PATH, actualsource, NULL) == 0) { - WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + WINE_FIXME("Unexpected failure expanding source path (%ld)\n", GetLastError()); return RC_INITERROR; } @@ -995,7 +995,7 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR * Validate the source, expanding to full path ensuring it exists */ if (GetFullPathNameW(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) { - WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + WINE_FIXME("Unexpected failure expanding source path (%ld)\n", GetLastError()); return RC_INITERROR; }

1 0

Alexandre Julliard : faudio: Import upstream release 22.02.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 6446382c74ccafcf006bf86af17c12e9ef3467be URL: https://source.winehq.org/git/wine.git/?a=commit;h=6446382c74ccafcf006bf86a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 7 11:53:56 2022 +0100 faudio: Import upstream release 22.02. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FAudio_platform_win32.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 28fa62c4fc5..eb3d5dea80b 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 22 -#define FAUDIO_MINOR_VERSION 1 +#define FAUDIO_MINOR_VERSION 2 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index 89101a6cf7a..9edb2b21bff 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -399,6 +399,12 @@ uint32_t FAudio_PlatformGetDeviceCount(void) eConsole, &device ); + + if (hr == E_NOTFOUND) { + FAudio_PlatformRelease(); + return 0; + } + FAudio_assert(!FAILED(hr) && "Failed to get default audio endpoint!"); IMMDevice_Release(device); @@ -1191,8 +1197,8 @@ static void FAudio_INTERNAL_DecodeWMAMF( uint32_t samples ) { const FAudioWaveFormatExtensible *wfx = (FAudioWaveFormatExtensible *)voice->src.format; + size_t samples_pos, samples_size, copy_size = 0; struct FAudioWMADEC *impl = voice->src.wmadec; - size_t samples_pos, samples_size, copy_size; HRESULT hr; LOG_FUNC_ENTER(voice->audio) @@ -1264,8 +1270,12 @@ static void FAudio_INTERNAL_DecodeWMAMF( impl->input_size = 0; } - copy_size = FAudio_clamp(impl->output_pos - samples_pos, 0, samples_size); - FAudio_memcpy(decodeCache, impl->output_buf + samples_pos, copy_size); + if (impl->output_pos > samples_pos) + { + copy_size = FAudio_min(impl->output_pos - samples_pos, samples_size); + FAudio_memcpy(decodeCache, impl->output_buf + samples_pos, copy_size); + } + FAudio_zero(decodeCache + copy_size, samples_size - copy_size); LOG_INFO( voice->audio, "decoded %x / %x bytes, copied %x / %x bytes",

1 0

Eric Pouech : wordpad: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: e7dda902a0626704bdab654346ece28e3f102e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dda902a0626704bdab6543… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:38 2022 +0100 wordpad: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/Makefile.in | 1 - programs/wordpad/olecallback.c | 8 ++++---- programs/wordpad/wordpad.c | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index e8fc1e38df8..265003a736a 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wordpad.exe IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32 diff --git a/programs/wordpad/olecallback.c b/programs/wordpad/olecallback.c index dcfef5898e6..e3bee7f850b 100644 --- a/programs/wordpad/olecallback.c +++ b/programs/wordpad/olecallback.c @@ -107,7 +107,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryInsertObject( LPSTORAGE lpstg, LONG cp) { - WINE_TRACE("(%p, %p, %p, %d)\n", This, lpclsid, lpstg, cp); + WINE_TRACE("(%p, %p, %p, %ld)\n", This, lpclsid, lpstg, cp); return S_OK; } @@ -127,7 +127,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryAcceptData( BOOL fReally, HGLOBAL hMetaPict) { - WINE_TRACE("(%p, %p, %p, %x, %d, %p)\n", + WINE_TRACE("(%p, %p, %p, %lx, %d, %p)\n", This, lpdataobj, lpcfFormat, reco, fReally, hMetaPict); return S_OK; } @@ -146,7 +146,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetClipboardData( DWORD reco, LPDATAOBJECT *lplpdataobj) { - WINE_TRACE("(%p, %p, %x, %p)\n", This, lpchrg, reco, lplpdataobj); + WINE_TRACE("(%p, %p, %lx, %p)\n", This, lpchrg, reco, lplpdataobj); return E_NOTIMPL; } @@ -156,7 +156,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetDragDropEffect( DWORD grfKeyState, LPDWORD pdwEffect) { - WINE_TRACE("(%p, %d, %x, %p)\n", This, fDrag, grfKeyState, pdwEffect); + WINE_TRACE("(%p, %d, %lx, %p)\n", This, fDrag, grfKeyState, pdwEffect); if (pdwEffect) *pdwEffect = DROPEFFECT_COPY; return S_OK; diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e87475ad06b..7f79eccc8bb 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2023,7 +2023,7 @@ static LRESULT OnCreate( HWND hWnd ) if (!hEditorWnd) { - fprintf(stderr, "Error code %u\n", GetLastError()); + fprintf(stderr, "Error code %lu\n", GetLastError()); return -1; } assert(hEditorWnd); @@ -2164,7 +2164,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) update_font_list(); - sprintf( buf,"selection = %d..%d, line count=%ld", + sprintf( buf,"selection = %ld..%ld, line count=%Id", pSC->chrg.cpMin, pSC->chrg.cpMax, SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); @@ -2451,7 +2451,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range); data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1)); SendMessageW(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); - sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); + sprintf(buf, "Start = %ld, End = %ld", range.cpMin, range.cpMax); MessageBoxA(hWnd, buf, "Editor", MB_OK); MessageBoxW(hWnd, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data);

1 0