February 2022 - Wine-commits

Michael Stefaniuc : dmsynth: Implement the synth's Open and Close methods.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 1383b841c5f699c6b75511aedd84c952b39f692e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1383b841c5f699c6b75511ae… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 00:51:59 2022 +0100 dmsynth: Implement the synth's Open and Close methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 +- dlls/dmsynth/dmsynth_private.h | 5 +-- dlls/dmsynth/synth.c | 91 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index cec89ca80aa..d09d0120023 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -286,7 +286,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; @@ -312,7 +312,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index aabf1f56904..0058ce04d3a 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -56,14 +56,13 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void ** * IDirectMusicSynth8Impl implementation structure */ struct IDirectMusicSynth8Impl { - /* IUnknown fields */ IDirectMusicSynth8 IDirectMusicSynth8_iface; IKsControl IKsControl_iface; LONG ref; - - /* IDirectMusicSynth8 fields */ DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; BOOL active; + BOOL open; IReferenceClock *latency_clock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index c69d7a340b1..2db80726408 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -94,21 +94,102 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) } /* IDirectMusicSynth8Impl IDirectMusicSynth part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, - DMUS_PORTPARAMS *pPortParams) +static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *params) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + BOOL modified = FALSE; + const DMUS_PORTPARAMS def = { + .dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS| + DMUS_PORTPARAMS_AUDIOCHANNELS|DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS| + DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES, + .dwSize = sizeof(def), .dwVoices = 32, .dwChannelGroups = 2, .dwAudioChannels = 2, + .dwSampleRate = 22050, .dwEffectFlags = DMUS_EFFECT_REVERB + }; + + TRACE("(%p, %p)\n", This, params); + + if (This->open) + return DMUS_E_ALREADYOPEN; + if (params && params->dwSize < sizeof(DMUS_PORTPARAMS7)) + return E_INVALIDARG; - FIXME("(%p)->(%p): stub\n", This, pPortParams); + This->open = TRUE; - return S_OK; + if (!params) { + memcpy(&This->params, &def, sizeof(This->params)); + return S_OK; + } + + if (params->dwValidParams & DMUS_PORTPARAMS_VOICES && params->dwVoices) { + if (params->dwVoices > This->caps.dwMaxVoices) { + modified = TRUE; + params->dwVoices = This->caps.dwMaxVoices; + } + } else + params->dwVoices = def.dwVoices; + + if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS && params->dwChannelGroups) { + if (params->dwChannelGroups > This->caps.dwMaxChannelGroups) { + modified = TRUE; + params->dwChannelGroups = This->caps.dwMaxChannelGroups; + } + } else + params->dwChannelGroups = def.dwChannelGroups; + + if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS && params->dwAudioChannels) { + if (params->dwAudioChannels > This->caps.dwMaxAudioChannels) { + modified = TRUE; + params->dwAudioChannels = This->caps.dwMaxAudioChannels; + } + } else + params->dwAudioChannels = def.dwAudioChannels; + + if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE && params->dwSampleRate) { + if (params->dwSampleRate > 96000) { + modified = TRUE; + params->dwSampleRate = 96000; + } else if (params->dwSampleRate < 11025) { + modified = TRUE; + params->dwSampleRate = 11025; + } + } else + params->dwSampleRate = def.dwSampleRate; + + if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS && params->dwEffectFlags != def.dwEffectFlags) + modified = TRUE; + params->dwEffectFlags = def.dwEffectFlags; + + if (params->dwValidParams & DMUS_PORTPARAMS_SHARE && params->fShare) + modified = TRUE; + params->fShare = FALSE; + + if (params->dwSize >= sizeof(params)) { + if (params->dwValidParams & DMUS_PORTPARAMS_FEATURES && params->dwFeatures) { + if (params->dwFeatures & ~(DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING)) { + modified = TRUE; + params->dwFeatures &= DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + } + } else + params->dwFeatures = def.dwFeatures; + params->dwValidParams = def.dwValidParams; + } else + params->dwValidParams = def.dwValidParams & ~DMUS_PORTPARAMS_FEATURES; + + memcpy(&This->params, params, min(params->dwSize, sizeof(This->params))); + + return modified ? S_FALSE : S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_Close(IDirectMusicSynth8 *iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)\n", This); + + if (!This->open) + return DMUS_E_ALREADYCLOSED; + + This->open = FALSE; return S_OK; }

1 0

Michael Stefaniuc : dmsynth/tests: Add some synth Open/Close tests.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 38f125a5b51ef220bd60d754a94d49f2eef3fd22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38f125a5b51ef220bd60d754… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 8 00:52:00 2022 +0100 dmsynth/tests: Add some synth Open/Close tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 5f2e9e95364..93212c0ae9f 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -65,6 +65,9 @@ static void test_dmsynth(void) ULONG value; ULONG bytes; DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; + const DWORD all_params = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| + DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS|DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %#lx\n", hr); @@ -121,6 +124,72 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_Activate(dmsynth, TRUE); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %#lx\n", hr); + /* Open / Close */ + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == DMUS_E_ALREADYOPEN, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_Close(dmsynth); + ok(hr == S_OK, "Close failed: %#lx\n", hr); + hr = IDirectMusicSynth_Close(dmsynth); + ok(hr == DMUS_E_ALREADYCLOSED, "Close failed: %#lx\n", hr); + memset(&params, 0, sizeof(params)); + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == E_INVALIDARG, "Open failed: %#lx\n", hr); + params.dwSize = sizeof(DMUS_PORTPARAMS7); + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + IDirectMusicSynth_Close(dmsynth); + /* All params supported and set to 0 */ + params.dwSize = sizeof(params); + params.dwValidParams = all_params; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + ok(params.dwSize == sizeof(params), "dwSize: %ld\n", params.dwSize); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwVoices == 32, "dwVoices: %ld\n", params.dwVoices); + ok(params.dwChannelGroups == 2, "dwChannelGroups: %ld\n", params.dwChannelGroups); + ok(params.dwAudioChannels == 2, "dwAudioChannels: %ld\n", params.dwAudioChannels); + ok(params.dwSampleRate == 22050, "dwSampleRate: %ld\n", params.dwSampleRate); + ok(params.dwEffectFlags == DMUS_EFFECT_REVERB, "params.dwEffectFlags: %#lx\n", params.dwEffectFlags); + ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); + ok(params.dwFeatures == 0, "dwFeatures: %#lx\n", params.dwFeatures); + IDirectMusicSynth_Close(dmsynth); + /* Requesting more than supported */ + params.dwValidParams = DMUS_PORTPARAMS_SAMPLERATE; + params.dwSampleRate = 100003; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwSampleRate == 96000, "dwSampleRate: %ld\n", params.dwSampleRate); + IDirectMusicSynth_Close(dmsynth); + /* Minimums */ + params.dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| + DMUS_PORTPARAMS_SAMPLERATE; + params.dwVoices = 1; + params.dwChannelGroups = 1; + params.dwAudioChannels = 1; + params.dwSampleRate = 1; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwVoices == 1, "dwVoices: %ld\n", params.dwVoices); + ok(params.dwChannelGroups == 1, "dwChannelGroups: %ld\n", params.dwChannelGroups); + ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels); + ok(params.dwSampleRate == 11025, "dwSampleRate: %ld\n", params.dwSampleRate); + IDirectMusicSynth_Close(dmsynth); + /* Test share and features */ + params.dwValidParams = DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; + params.fShare = TRUE; + params.dwFeatures = DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); + ok(params.dwFeatures == (DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING), + "dwFeatures: %#lx\n", params.dwFeatures); + IDirectMusicSynth_Close(dmsynth); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %#lx\n", hr);

1 0

Zebediah Figura : qcap: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator().
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 72ede0ec6b18508e36197c8525d4861a7434751f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ede0ec6b18508e36197c85… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:44 2022 -0600 qcap: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index fe4add83b7c..45b995cc2ff 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1177,9 +1177,12 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, TRACE("(%p)->(%p %p)\n", base, pPin, pAlloc); - hr = BaseOutputPinImpl_InitAllocator(base, pAlloc); - if(FAILED(hr)) + if (FAILED(hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc))) + { + ERR("Failed to create allocator, hr %#x.\n", hr); return hr; + } hr = IMemInputPin_GetAllocatorRequirements(pPin, &req); if(FAILED(hr))

1 0

Zebediah Figura : amstream/tests: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator().
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 4e610a078a00d962b3a313ba1dc5c861f3888790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e610a078a00d962b3a313ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:45 2022 -0600 amstream/tests: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5b3e78e0583..6b17ba6d430 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1140,7 +1140,8 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, * when it is able to do so it's behavior changes slightly * (e.g. it uses dynamic format change instead of reconnecting in SetFormat). * We don't yet implement the custom allocator so force the standard one for now. */ - hr = BaseOutputPinImpl_InitAllocator(iface, alloc); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)alloc); ok(hr == S_OK, "Got hr %#x.\n", hr); IMemInputPin_GetAllocatorRequirements(pin, &props);

1 0

Zebediah Figura : strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 98a2689f76ecbe097a0219d7ee332b4f6382bc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a2689f76ecbe097a0219d7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:46 2022 -0600 strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 1 - libs/strmbase/pin.c | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 868ea4c580a..3e92136b7f7 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -105,7 +105,6 @@ struct strmbase_sink_ops }; /* Base Pin */ -HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt); diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index f6e4ef1c139..36784f60a23 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -677,11 +677,6 @@ static const IPinVtbl source_vtbl = source_NewSegment, }; -HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc) -{ - return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc); -} - HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, IMemInputPin *pPin, IMemAllocator **pAlloc) { @@ -690,8 +685,8 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, hr = IMemInputPin_GetAllocator(pPin, pAlloc); if (hr == VFW_E_NO_ALLOCATOR) - /* Input pin provides no allocator, use standard memory allocator */ - hr = BaseOutputPinImpl_InitAllocator(This, pAlloc); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc); if (SUCCEEDED(hr)) {

1 0

Eric Pouech : acledit: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: cc6384b0488ceb7541c45bb04787c9bc3d528ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc6384b0488ceb7541c45bb0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:09:57 2022 +0100 acledit: 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/acledit/Makefile.in | 1 - dlls/acledit/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in index f117462a5ea..ca2c27e3528 100644 --- a/dlls/acledit/Makefile.in +++ b/dlls/acledit/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = acledit.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index 314fa4ab0c6..690a762b5c9 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(acledit); LONG WINAPI FMExtensionProcW(HWND hWnd, WORD wEvent, LONG lParam) { - FIXME("(%p, %d, 0x%x) stub\n", hWnd, wEvent, lParam); + FIXME("(%p, %d, 0x%lx) stub\n", hWnd, wEvent, lParam); return 0; }

1 0

Eric Pouech : aclui: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 89a837c41998e294fb41e0beabf2e40f284bd30a URL: https://source.winehq.org/git/wine.git/?a=commit;h=89a837c41998e294fb41e0be… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:03 2022 +0100 aclui: 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/aclui/Makefile.in | 1 - dlls/aclui/aclui_main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index 133e31f7487..a4879f54c4b 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = aclui.dll IMPORTLIB = aclui IMPORTS = comctl32 user32 advapi32 gdi32 diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index ace58127674..0c5206ae084 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -238,7 +238,7 @@ static void init_users(struct security_page *page) if (!GetSecurityDescriptorDacl(page->sd, &present, &dacl, &defaulted)) { - ERR("Failed to query descriptor information, error %u.\n", GetLastError()); + ERR("Failed to query descriptor information, error %lu.\n", GetLastError()); return; } @@ -339,14 +339,14 @@ static void security_page_init_dlg(HWND hwnd, struct security_page *page) if (FAILED(hr = ISecurityInformation_GetSecurity(page->security, DACL_SECURITY_INFORMATION, &page->sd, FALSE))) { - ERR("Failed to get security descriptor, hr %#x.\n", hr); + ERR("Failed to get security descriptor, hr %#lx.\n", hr); return; } if (FAILED(hr = ISecurityInformation_GetAccessRights(page->security, NULL, 0, &page->access, &page->access_count, &def))) { - ERR("Failed to get access mapping, hr %#x.\n", hr); + ERR("Failed to get access mapping, hr %#lx.\n", hr); return; }

1 0

Eric Pouech : activeds: Enable compilation with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 14a5d71f39d6f0b462f2bc684c256f4730435c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a5d71f39d6f0b462f2bc68… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:10:09 2022 +0100 activeds: 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/activeds/Makefile.in | 1 - dlls/activeds/activeds_main.c | 14 +++++++------- dlls/activeds/pathname.c | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index 0ab8281c1f2..b9fbdfeca82 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = activeds.dll IMPORTLIB = activeds IMPORTS = advapi32 ole32 oleaut32 uuid diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 9a8bb3b0e73..e04485b4e36 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -76,7 +76,7 @@ HRESULT WINAPI ADsFreeEnumerator(IEnumVARIANT* pEnumVariant) */ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VARIANT* pvar, ULONG * pcElementsFetched) { - FIXME("(%p)->(%u, %p, %p)!stub\n",pEnumVariant, cElements, pvar, pcElementsFetched); + FIXME("(%p)->(%lu, %p, %p)!stub\n",pEnumVariant, cElements, pvar, pcElementsFetched); return E_NOTIMPL; } @@ -89,7 +89,7 @@ HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *str, DWORD count, VARIANT *var) SAFEARRAY *sa; LONG idx, end = count; - TRACE("(%p, %u, %p)\n", str, count, var); + TRACE("(%p, %lu, %p)\n", str, count, var); if (!var) return E_ADS_BAD_PARAMETER; @@ -128,7 +128,7 @@ fail: */ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, VARIANT* pvar) { - FIXME("(%p, %d, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); + FIXME("(%p, %ld, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); return E_NOTIMPL; } @@ -142,7 +142,7 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD WCHAR provider[MAX_PATH], progid[MAX_PATH]; DWORD idx = 0; - TRACE("(%s,%s,%u,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj); + TRACE("(%s,%s,%lu,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj); if (!path || !riid || !obj) return E_INVALIDARG; @@ -216,7 +216,7 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD */ VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider) { - FIXME("(%d,%p,%p)!stub\n", dwErr, pszError, pszProvider); + FIXME("(%ld,%p,%p)!stub\n", dwErr, pszError, pszProvider); } /***************************************************** @@ -224,7 +224,7 @@ VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider) */ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbuflen, LPWSTR namebuf, DWORD namebuflen) { - FIXME("(%p,%p,%d,%p,%d)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); + FIXME("(%p,%p,%ld,%p,%ld)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); return E_NOTIMPL; } @@ -295,6 +295,6 @@ BOOL WINAPI ReallocADsStr(LPWSTR *ppStr, LPWSTR pStr) */ HRESULT WINAPI ADsEncodeBinaryData(PBYTE pbSrcData, DWORD dwSrcLen, LPWSTR *ppszDestData) { - FIXME("(%p,%d,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData); + FIXME("(%p,%ld,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData); return E_NOTIMPL; } diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index fbc7984f2e4..943afd5603d 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -98,21 +98,21 @@ static HRESULT WINAPI path_GetTypeInfoCount(IADsPathname *iface, UINT *count) static HRESULT WINAPI path_GetTypeInfo(IADsPathname *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%#lx,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI path_GetIDsOfNames(IADsPathname *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI path_Invoke(IADsPathname *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -180,7 +180,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) HRESULT hr; BSTR provider, server, dn; - TRACE("%p,%s,%d\n", iface, debugstr_w(adspath), type); + TRACE("%p,%s,%ld\n", iface, debugstr_w(adspath), type); if (!adspath) return E_INVALIDARG; @@ -207,7 +207,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) if (type != ADS_SETTYPE_FULL) { - FIXME("type %d not implemented\n", type); + FIXME("type %ld not implemented\n", type); return E_INVALIDARG; } @@ -227,7 +227,7 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) { - FIXME("%p,%d: stub\n", iface, type); + FIXME("%p,%ld: stub\n", iface, type); return E_NOTIMPL; } @@ -236,14 +236,14 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat Pathname *path = impl_from_IADsPathname(iface); int len; - TRACE("%p,%d,%p\n", iface, type, adspath); + TRACE("%p,%ld,%p\n", iface, type, adspath); if (!adspath) return E_INVALIDARG; switch (type) { default: - FIXME("type %d not implemented\n", type); + FIXME("type %ld not implemented\n", type); /* fall through */ case ADS_FORMAT_X500: @@ -320,7 +320,7 @@ static HRESULT WINAPI path_GetElement(IADsPathname *iface, LONG index, BSTR *ele WCHAR *p, *end; LONG count; - TRACE("%p,%d,%p\n", iface, index, element); + TRACE("%p,%ld,%p\n", iface, index, element); if (!element) return E_INVALIDARG; @@ -366,7 +366,7 @@ static HRESULT WINAPI path_CopyPath(IADsPathname *iface, IDispatch **path) static HRESULT WINAPI path_GetEscapedElement(IADsPathname *iface, LONG reserved, BSTR element, BSTR *str) { - FIXME("%p,%d,%s,%p: stub\n", iface, reserved, debugstr_w(element), str); + FIXME("%p,%ld,%s,%p: stub\n", iface, reserved, debugstr_w(element), str); return E_NOTIMPL; } @@ -378,7 +378,7 @@ static HRESULT WINAPI path_get_EscapedMode(IADsPathname *iface, LONG *mode) static HRESULT WINAPI path_put_EscapedMode(IADsPathname *iface, LONG mode) { - FIXME("%p,%d: stub\n", iface, mode); + FIXME("%p,%ld: stub\n", iface, mode); return E_NOTIMPL; } @@ -469,7 +469,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; } @@ -479,7 +479,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

Alexandre Julliard : vkd3d-shader: Define S_ISREG if necessary for the Windows build.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: vkd3d Branch: master Commit: fd5d6cd454ed1d99b8288a5dc66ebfe87c51381c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd5d6cd454ed1d99b8288a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 8 15:09:29 2022 +0100 vkd3d-shader: Define S_ISREG if necessary for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/preproc.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index ac6f647..3f02ac0 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -48,6 +48,10 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, #define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n) +#ifndef S_ISREG +# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, enum vkd3d_shader_error error, const char *format, ...) {

1 0

Alexandre Julliard : vkd3d-shader: Undefine ERROR to avoid a compiler warning on Windows.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: vkd3d Branch: master Commit: af9bf3bbf201e8bebde9ec290b94681a7888324b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=af9bf3bbf201e8bebde9ec2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 8 15:09:51 2022 +0100 vkd3d-shader: Undefine ERROR to avoid a compiler warning on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/preproc.l | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 5454233..20cb0c3 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -22,6 +22,8 @@ #include "preproc.tab.h" +#undef ERROR /* defined in wingdi.h */ + #define YYSTYPE PREPROC_YYSTYPE #define YYLTYPE PREPROC_YYLTYPE

1 0