wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Andrew Eikum : audioclient.idl: Declare IAudioClient3.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 496a8c1cf55f3836260d5ca485c5c5753bad1d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=496a8c1cf55f3836260d5ca4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:36 2020 -0500 audioclient.idl: Declare IAudioClient3. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 4759f3ef46..132e78a602 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -151,6 +151,35 @@ interface IAudioClient2 : IAudioClient ); } +[ + local, + pointer_default(unique), + uuid(7ed4ee07-8e67-4cd4-8c1a-2b7a5987ad42), + object, +] +interface IAudioClient3 : IAudioClient2 +{ + HRESULT GetSharedModeEnginePeriod( + [in] const WAVEFORMATEX *format, + [out] UINT32 *default_period_frames, + [out] UINT32 *unit_period_frames, + [out] UINT32 *min_period_frames, + [out] UINT32 *max_period_frames + ); + + HRESULT GetCurrentSharedModeEnginePeriod( + [out] WAVEFORMATEX **cur_format, + [out] UINT32 *cur_period_frames + ); + + HRESULT InitializeSharedAudioStream( + [in] DWORD flags, + [in] UINT32 period_frames, + [in] const WAVEFORMATEX *format, + [in] const GUID *session_guid + ); +} + [ local, pointer_default(unique),

1 0

Andrew Eikum : mmdevapi: Implement SetClientProperties.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: d8ae98d4216b85b3da342ef71b28674996e5c9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ae98d4216b85b3da342ef7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:32 2020 -0500 mmdevapi: Implement SetClientProperties. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 25 +++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/wineandroid.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/wineoss.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/winepulse.drv/mmdevdrv.c | 18 ++++++++++++++++-- 6 files changed, 105 insertions(+), 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e58cc449d8..a4f271e557 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -141,6 +141,7 @@ static void test_audioclient(void) REFERENCE_TIME t1, t2; HANDLE handle; BOOL offload_capable; + AudioClientProperties client_props; hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -260,6 +261,30 @@ static void test_audioclient(void) hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, NULL); + ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + + client_props.cbSize = 0; + client_props.bIsOffload = FALSE; + client_props.eCategory = AudioCategory_BackgroundCapableMedia; + client_props.Options = 0; + + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); + + client_props.cbSize = sizeof(client_props); + client_props.bIsOffload = TRUE; + + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + if(!offload_capable) + ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); + else + ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + + client_props.bIsOffload = FALSE; + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + IAudioClient2_Release(ac2); test_uninitialized(ac); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 233b0dfda1..04f90d0d16 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2676,9 +2676,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 8ee1bb12d3..aa32c49185 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1635,9 +1635,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f32c1d5e41..f065d5bc1e 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2243,9 +2243,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9b1cdf3fa7..3a3cb57b64 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1800,9 +1800,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e384955b01..91b8230bd8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2248,9 +2248,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface,

1 0

Andrew Eikum : mmdevapi: Implement IsOffloadCapable.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 530c79fba272219e9ed7bc1ebf309fe7163ac8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=530c79fba272219e9ed7bc1e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:27 2020 -0500 mmdevapi: Implement IsOffloadCapable. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 7 +++++++ dlls/winealsa.drv/mmdevdrv.c | 9 +++++++-- dlls/wineandroid.drv/mmdevdrv.c | 9 +++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 9 +++++++-- dlls/wineoss.drv/mmdevdrv.c | 9 +++++++-- dlls/winepulse.drv/mmdevdrv.c | 9 +++++++-- 6 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8d52f48333..e58cc449d8 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -140,6 +140,7 @@ static void test_audioclient(void) WAVEFORMATEX *pwfx, *pwfx2; REFERENCE_TIME t1, t2; HANDLE handle; + BOOL offload_capable; hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -253,6 +254,12 @@ static void test_audioclient(void) hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2); ok(hr == S_OK, "Failed to query IAudioClient2 interface: %08x\n", hr); + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); + ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); + + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); + ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + IAudioClient2_Release(ac2); test_uninitialized(ac); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2c3165385e..233b0dfda1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2661,9 +2661,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 4e9ada3f55..8ee1bb12d3 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1620,9 +1620,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index dd2ad916f8..f32c1d5e41 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2228,9 +2228,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 50c7db2c7c..9b1cdf3fa7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1785,9 +1785,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index b8386cfe55..e384955b01 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2233,9 +2233,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface,

1 0

Andrew Eikum : mmdevapi: Stub implement IAudioClient2.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 370a538e54bc7d2b97c8f845f702adfc51902862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=370a538e54bc7d2b97c8f845… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:22 2020 -0500 mmdevapi: Stub implement IAudioClient2. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 3 +- dlls/mmdevapi/tests/render.c | 11 +++ dlls/winealsa.drv/mmdevdrv.c | 144 +++++++++++++++++++++++-------------- dlls/wineandroid.drv/mmdevdrv.c | 147 +++++++++++++++++++++++--------------- dlls/winecoreaudio.drv/mmdevdrv.c | 144 +++++++++++++++++++++++-------------- dlls/wineoss.drv/mmdevdrv.c | 145 +++++++++++++++++++++++-------------- dlls/winepulse.drv/mmdevdrv.c | 142 ++++++++++++++++++++++-------------- 7 files changed, 463 insertions(+), 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=370a538e54bc7d2b97c8…

1 0

Andrew Eikum : audioclient.idl: Declare IAudioClient2.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: afd143228b6383d242888a8aeb90c8bedc584c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd143228b6383d242888a8a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:17 2020 -0500 audioclient.idl: Declare IAudioClient2. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 0628444bef..4759f3ef46 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -111,6 +111,46 @@ interface IAudioClient : IUnknown ); } +typedef enum _AUDCLNT_STREAMOPTIONS +{ + AUDCLNT_STREAMOPTIONS_NONE = 0, + AUDCLNT_STREAMOPTIONS_RAW = 1, + AUDCLNT_STREAMOPTIONS_MATCH_FORMAT = 2, +} AUDCLNT_STREAMOPTIONS; + +typedef struct _AudioClientProperties +{ + UINT32 cbSize; + BOOL bIsOffload; + AUDIO_STREAM_CATEGORY eCategory; + AUDCLNT_STREAMOPTIONS Options; +} AudioClientProperties; + +[ + local, + pointer_default(unique), + uuid(726778cd-f60a-4eda-82de-e47610cd78aa), + object, +] +interface IAudioClient2 : IAudioClient +{ + HRESULT IsOffloadCapable( + AUDIO_STREAM_CATEGORY category, + [out] BOOL *offload_capable + ); + + HRESULT SetClientProperties( + [in] const AudioClientProperties *prop + ); + + HRESULT GetBufferSizeLimits( + [in] const WAVEFORMATEX *format, + BOOL event_driven, + [out] REFERENCE_TIME *min_duration, + [out] REFERENCE_TIME *max_duration + ); +} + [ local, pointer_default(unique),

1 0

Michael Stefaniuc : msftedit: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 6d3d0884c0999da296d6a18b9033fb92ee087c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d3d0884c0999da296d6a18b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:33 2020 +0200 msftedit: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msftedit/msftedit_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c index c578efafda..fbad7182a5 100644 --- a/dlls/msftedit/msftedit_main.c +++ b/dlls/msftedit/msftedit_main.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msftedit); */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { - static const WCHAR riched20W[] = {'r','i','c','h','e','d','2','0','.','d','l','l',0}; static HMODULE richedit; switch(reason) @@ -51,7 +50,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: /* explicitly load riched20 since it creates the window classes at dll attach time */ - richedit = LoadLibraryW( riched20W ); + richedit = LoadLibraryW( L"riched20.dll" ); DisableThreadLibraryCalls(inst); break; case DLL_PROCESS_DETACH:

1 0

Michael Stefaniuc : msadp32.acm: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 93a55831b2b677c3b10365de613f4693f7813d62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a55831b2b677c3b10365de… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:32 2020 +0200 msadp32.acm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msadp32.acm/msadp32.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 78d99a21de..8b83f69c00 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -404,9 +404,6 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szMsAdPcm[]={'M','i','c','r','o','s','o','f','t',' ','A','D','P','C','M',0}; - switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -439,13 +436,13 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); - lstrcpyW(aftd->szFormatTag, szPcm); + lstrcpyW(aftd->szFormatTag, L"PCM"); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ADPCM; aftd->cbFormatSize = sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET); aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); - lstrcpyW(aftd->szFormatTag, szMsAdPcm); + lstrcpyW(aftd->szFormatTag, L"Microsoft ADPCM"); break; } return MMSYSERR_NOERROR;

1 0

Michael Stefaniuc : mciqtz32: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 586dbd1e1e75d5e92b6a48ddf9f9dd7baf16f613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586dbd1e1e75d5e92b6a48dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:31 2020 +0200 mciqtz32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index ec4a8b531a..487a0d820c 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -74,7 +74,6 @@ static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) { WINE_MCIQTZ* wma; - static const WCHAR mciAviWStr[] = {'M','C','I','A','V','I',0}; TRACE("(%s, %p)\n", debugstr_w(str), modp); @@ -89,7 +88,7 @@ static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) wma->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; wma->wDevID = modp->wDeviceID; - modp->wCustomCommandTable = wma->command_table = mciLoadCommandResource(MCIQTZ_hInstance, mciAviWStr, 0); + modp->wCustomCommandTable = wma->command_table = mciLoadCommandResource(MCIQTZ_hInstance, L"MCIAVI", 0); mciSetDriverData(wma->wDevID, (DWORD_PTR)wma); return modp->wDeviceID;

1 0

Michael Stefaniuc : jsproxy: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 6c8fac7dfe8cfcbf7ad5b8b661f308cafa5a7127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8fac7dfe8cfcbf7ad5b8b6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:30 2020 +0200 jsproxy: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 905d2d93c1..1fbaa5cccc 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -46,9 +46,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION cs_jsproxy = { &critsect_debug, -1, 0, 0, 0, 0 }; -static const WCHAR global_funcsW[] = {'g','l','o','b','a','l','_','f','u','n','c','s',0}; -static const WCHAR dns_resolveW[] = {'d','n','s','_','r','e','s','o','l','v','e',0}; - /****************************************************************** * DllMain (jsproxy.@) */ @@ -271,7 +268,7 @@ static HRESULT WINAPI dispex_GetNameSpaceParent( static HRESULT WINAPI dispex_GetDispID( IDispatchEx *iface, BSTR name, DWORD flags, DISPID *id ) { - if (!lstrcmpW( name, dns_resolveW )) + if (!lstrcmpW( name, L"dns_resolve" )) { *id = DISPID_GLOBAL_DNSRESOLVE; return S_OK; @@ -306,7 +303,6 @@ static void printf_addr( const WCHAR *fmt, WCHAR *buf, SIZE_T size, struct socka static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) { - static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; WCHAR addr[16]; struct addrinfo *ai, *elem; char *hostnameA; @@ -329,7 +325,7 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) freeaddrinfo( ai ); return S_FALSE; } - printf_addr( fmtW, addr, ARRAY_SIZE(addr), (struct sockaddr_in *)elem->ai_addr ); + printf_addr( L"%u.%u.%u.%u", addr, ARRAY_SIZE(addr), (struct sockaddr_in *)elem->ai_addr ); freeaddrinfo( ai ); V_VT( result ) = VT_BSTR; V_BSTR( result ) = SysAllocString( addr ); @@ -408,7 +404,7 @@ static HRESULT WINAPI site_GetItemInfo( IActiveScriptSite *iface, LPCOLESTR name, DWORD mask, IUnknown **item, ITypeInfo **type_info ) { - if (!lstrcmpW( name, global_funcsW ) && mask == SCRIPTINFO_IUNKNOWN) + if (!lstrcmpW( name, L"global_funcs" ) && mask == SCRIPTINFO_IUNKNOWN) { *item = (IUnknown *)&global_dispex; return S_OK; @@ -471,7 +467,6 @@ static IActiveScriptSite script_site = { &site_vtbl }; static BSTR include_pac_utils( const WCHAR *script ) { - static const WCHAR pacjsW[] = {'p','a','c','.','j','s',0}; HMODULE hmod = GetModuleHandleA( "jsproxy.dll" ); HRSRC rsrc; DWORD size; @@ -479,7 +474,7 @@ static BSTR include_pac_utils( const WCHAR *script ) BSTR ret; int len; - if (!(rsrc = FindResourceW( hmod, pacjsW, (LPCWSTR)40 ))) return NULL; + if (!(rsrc = FindResourceW( hmod, L"pac.js", (LPCWSTR)40 ))) return NULL; size = SizeofResource( hmod, rsrc ); data = LoadResource( hmod, rsrc ); @@ -502,8 +497,6 @@ static BSTR include_pac_utils( const WCHAR *script ) static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *hostname, char **result_str, DWORD *result_len ) { - static const WCHAR jscriptW[] = {'J','S','c','r','i','p','t',0}; - static const WCHAR findproxyW[] = {'F','i','n','d','P','r','o','x','y','F','o','r','U','R','L',0}; IActiveScriptParse *parser = NULL; IActiveScript *engine = NULL; IDispatch *dispatch = NULL; @@ -516,7 +509,7 @@ static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *host HRESULT hr, init; init = CoInitialize( NULL ); - hr = CLSIDFromProgID( jscriptW, &clsid ); + hr = CLSIDFromProgID( L"JScript", &clsid ); if (hr != S_OK) goto done; hr = CoCreateInstance( &clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -532,7 +525,7 @@ static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *host hr = IActiveScript_SetScriptSite( engine, &script_site ); if (hr != S_OK) goto done; - hr = IActiveScript_AddNamedItem( engine, global_funcsW, SCRIPTITEM_GLOBALMEMBERS ); + hr = IActiveScript_AddNamedItem( engine, L"global_funcs", SCRIPTITEM_GLOBALMEMBERS ); if (hr != S_OK) goto done; if (!(full_script = include_pac_utils( script ))) goto done; @@ -546,7 +539,7 @@ static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *host hr = IActiveScript_GetScriptDispatch( engine, NULL, &dispatch ); if (hr != S_OK) goto done; - if (!(func = SysAllocString( findproxyW ))) goto done; + if (!(func = SysAllocString( L"FindProxyForURL" ))) goto done; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &func, 1, LOCALE_SYSTEM_DEFAULT, &dispid ); if (hr != S_OK) goto done;

1 0

Michael Stefaniuc : infosoft/tests: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: 449d269470a21d32bfe73958899bfad794e69e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=449d269470a21d32bfe73958… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:29 2020 +0200 infosoft/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/tests/infosoft.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c index 1e2792f19a..12bf65a56d 100644 --- a/dlls/infosoft/tests/infosoft.c +++ b/dlls/infosoft/tests/infosoft.c @@ -32,12 +32,7 @@ DEFINE_GUID(CLSID_wb_neutral, 0x369647e0,0x17b0,0x11ce,0x99,0x50,0x00,0xaa,0x00,0x4b,0xbb,0x1f); DEFINE_GUID(_IID_IWordBreaker, 0xD53552C8,0x77E3,0x101A,0xB5,0x52,0x08,0x00,0x2B,0x33,0xB0,0xE6); -static const WCHAR teststring[] = { - 's','q','u','a','r','e',' ', - 'c','i','r','c','l','e',' ', - 't','r','i','a','n','g','l','e',' ', - 'b','o','x',0 -}; +static const WCHAR teststring[] = L"square circle triangle box"; struct expected { UINT ofs; @@ -48,10 +43,10 @@ struct expected { static int wordnum; static struct expected testres[] = { - { 0, 6, {'s','q','u','a','r','e',0 }}, - { 7, 6, {'c','i','r','c','l','e',0 }}, - { 14, 8, {'t','r','i','a','n','g','l','e',0 }}, - { 23, 3, {'b','o','x',0}}, + { 0, 6, L"square" }, + { 7, 6, L"circle" }, + { 14, 8, L"triangle" }, + { 23, 3, L"box" }, }; static HRESULT WINAPI ws_QueryInterface(IWordSink *iface, REFIID riid, void **ppvObject)

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
80
Older →

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 October 2020