February 2022 - Wine-Commits

Nikolay Sivov : mfmediaengine: Handle realtime mode flag.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 40c992398249c039358b2bf1dcf16c075ac9ae63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c992398249c039358b2bf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:41 2022 +0300 mfmediaengine: Handle realtime mode flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 31 ++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 38 +++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index a78cc130657..01ce8cd6437 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1169,6 +1169,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFTopologyNode *sar_node = NULL, *audio_src = NULL; IMFTopologyNode *grabber_node = NULL, *video_src = NULL; + if (engine->flags & MF_MEDIA_ENGINE_REAL_TIME_MODE) + IMFTopology_SetUINT32(topology, &MF_LOW_LATENCY, TRUE); + if (sd_audio) { if (FAILED(hr = media_engine_create_source_node(source, pd, sd_audio, &audio_src))) @@ -2695,16 +2698,36 @@ static HRESULT WINAPI media_engine_SetAudioEndpointRole(IMFMediaEngineEx *iface, static HRESULT WINAPI media_engine_GetRealTimeMode(IMFMediaEngineEx *iface, BOOL *enabled) { - FIXME("%p, %p stub.\n", iface, enabled); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, enabled); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + *enabled = !!(engine->flags & MF_MEDIA_ENGINE_REAL_TIME_MODE); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetRealTimeMode(IMFMediaEngineEx *iface, BOOL enable) { - FIXME("%p, %d stub.\n", iface, enable); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, enable); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + media_engine_set_flag(engine, MF_MEDIA_ENGINE_REAL_TIME_MODE, enable); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetCurrentTimeEx(IMFMediaEngineEx *iface, double seektime, MF_MEDIA_ENGINE_SEEK_MODE mode) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index f05f24b7172..e4d9d752f20 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -240,12 +240,14 @@ static void test_factory(void) static void test_CreateInstance(void) { struct media_engine_notify *notify; + IMFMediaEngineEx *media_engine_ex; IMFDXGIDeviceManager *manager; IMFMediaEngine *media_engine; IMFAttributes *attributes; IUnknown *unk; UINT token; HRESULT hr; + BOOL ret; notify = create_callback(); @@ -273,7 +275,8 @@ static void test_CreateInstance(void) hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_REAL_TIME_MODE + | MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_interface(media_engine, &IID_IMFMediaEngine, TRUE); @@ -283,6 +286,29 @@ static void test_CreateInstance(void) if (SUCCEEDED(hr)) IUnknown_Release(unk); + if (SUCCEEDED(IMFMediaEngine_QueryInterface(media_engine, &IID_IMFMediaEngineEx, (void **)&media_engine_ex))) + { + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, &ret); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(ret, "Unexpected value.\n"); + + hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, &ret); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!ret, "Unexpected value.\n"); + + hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, &ret); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(ret, "Unexpected value.\n"); + + IMFMediaEngineEx_Release(media_engine_ex); + } + IMFMediaEngine_Release(media_engine); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); @@ -301,6 +327,7 @@ static void test_Shutdown(void) double val; HRESULT hr; BSTR str; + BOOL ret; notify = create_callback(); @@ -457,6 +484,15 @@ static void test_Shutdown(void) hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine_ex, &flags); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, &ret); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, TRUE); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); }

1 0

Nikolay Sivov : mfmediaengine: Implement GetPresentationAttribute().
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 2086698e7dde632e51624226a12377f42683ed1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2086698e7dde632e51624226… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:42 2022 +0300 mfmediaengine: Implement GetPresentationAttribute(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 8 ++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 01ce8cd6437..bb338a4423f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -143,6 +143,7 @@ struct media_engine struct { IMFMediaSource *source; + IMFPresentationDescriptor *pd; } presentation; struct { @@ -1079,9 +1080,11 @@ static void media_engine_clear_presentation(struct media_engine *engine) { if (engine->presentation.source) { - IMFMediaSource_Shutdown(engine->presentation.source); - IMFMediaSource_Release(engine->presentation.source); + IMFMediaSource_Shutdown(engine->presentation.source); + IMFMediaSource_Release(engine->presentation.source); } + if (engine->presentation.pd) + IMFPresentationDescriptor_Release(engine->presentation.pd); memset(&engine->presentation, 0, sizeof(engine->presentation)); } @@ -1151,6 +1154,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi engine->presentation.source = source; IMFMediaSource_AddRef(engine->presentation.source); + engine->presentation.pd = pd; + IMFPresentationDescriptor_AddRef(engine->presentation.pd); media_engine_set_flag(engine, FLAGS_ENGINE_HAS_VIDEO, !!sd_video); media_engine_set_flag(engine, FLAGS_ENGINE_HAS_AUDIO, !!sd_audio); @@ -2474,9 +2479,19 @@ static HRESULT WINAPI media_engine_GetResourceCharacteristics(IMFMediaEngineEx * static HRESULT WINAPI media_engine_GetPresentationAttribute(IMFMediaEngineEx *iface, REFGUID attribute, PROPVARIANT *value) { - FIXME("%p, %s, %p stub.\n", iface, debugstr_guid(attribute), value); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_FAIL; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(attribute), value); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->presentation.pd) + hr = IMFPresentationDescriptor_GetItem(engine->presentation.pd, attribute, value); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetNumberOfStreams(IMFMediaEngineEx *iface, DWORD *stream_count) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index e4d9d752f20..0eaf614fc66 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -321,6 +321,7 @@ static void test_Shutdown(void) IMFMediaEngineEx *media_engine_ex; IMFMediaTimeRange *time_range; IMFMediaEngine *media_engine; + PROPVARIANT propvar; DWORD flags, cx, cy; unsigned int state; UINT32 value; @@ -493,6 +494,9 @@ static void test_Shutdown(void) hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, TRUE); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine_ex, &MF_PD_DURATION, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); } @@ -905,6 +909,7 @@ static void test_SetSourceFromByteStream(void) { struct media_engine_notify *notify; IMFMediaEngineEx *media_engine; + PROPVARIANT propvar; DWORD flags; HRESULT hr; @@ -927,6 +932,9 @@ static void test_SetSourceFromByteStream(void) hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine, &flags); ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine, &MF_PD_DURATION, &propvar); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); }

1 0

Eric Pouech : shdocvw: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 048084a67022f2750d1ddf002f034fef8a325493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=048084a67022f2750d1ddf00… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:03 2022 +0100 shdocvw: 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/shdocvw/Makefile.in | 2 +- dlls/shdocvw/shdocvw_main.c | 24 ++++++++++++------------ dlls/shdocvw/shlinstobj.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 88b5340abda..30b0a1a299c 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHDOCVW_ +EXTRADEFS = -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32 diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index a641bd92a73..b5b60054f2c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -120,7 +120,7 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) */ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -246,7 +246,7 @@ DWORD WINAPI RunInstallUninstallStubs2(int arg) */ DWORD WINAPI SetQueryNetSessionCount(DWORD arg) { - FIXME("(%u), stub!\n", arg); + FIXME("(%lu), stub!\n", arg); return 0; } @@ -318,7 +318,7 @@ HRESULT WINAPI URLSubRegQueryA(LPCSTR regpath, LPCSTR name, DWORD type, DWORD len; LONG res; - TRACE("(%s, %s, %d, %p, %d, %d)\n", debugstr_a(regpath), debugstr_a(name), + TRACE("(%s, %s, %ld, %p, %ld, %ld)\n", debugstr_a(regpath), debugstr_a(name), type, out, outlen, unknown); if (!out) return S_OK; @@ -347,14 +347,14 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L DWORD res = 0; - TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, + TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_w(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); if (!PathIsURLW(ptr)) { len = ARRAY_SIZE(buffer_in); buffer_in[0] = 0; hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); - TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); + TRACE("got 0x%lx with %s\n", hr, debugstr_w(buffer_in)); if (hr == S_OK) { /* we parsed the url to buffer_in */ ptr = buffer_in; @@ -369,7 +369,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L buffer_out[0] = '\0'; hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); needed = lstrlenW(buffer_out)+1; - TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); + TRACE("got 0x%lx with %s (need %ld)\n", hr, debugstr_w(buffer_out), needed); if (*plen >= needed) { if (out != NULL) { @@ -381,7 +381,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L *plen = needed; - TRACE("=> %d\n", res); + TRACE("=> %ld\n", res); return res; } @@ -398,7 +398,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD DWORD res; DWORD len; - TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_a(url), out, plen, unknown, + TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_a(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); if (url) { @@ -424,7 +424,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD *plen = needed; - TRACE("=> %d\n", res); + TRACE("=> %ld\n", res); return res; } @@ -434,7 +434,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl) { /* Guessing at parameter 3 based on IShellFolder's ParseDisplayName */ - FIXME("stub: 0x%x %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); + FIXME("stub: 0x%lx %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); return E_FAIL; } @@ -443,7 +443,7 @@ HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName */ DWORD WINAPI SHRestricted2W(DWORD res, LPCWSTR url, DWORD reserved) { - FIXME("(%d %s %d) stub\n", res, debugstr_w(url), reserved); + FIXME("(%ld %s %ld) stub\n", res, debugstr_w(url), reserved); return 0; } @@ -457,7 +457,7 @@ DWORD WINAPI SHRestricted2A(DWORD restriction, LPCSTR url, DWORD reserved) LPWSTR urlW = NULL; DWORD res; - TRACE("(%d, %s, %d)\n", restriction, debugstr_a(url), reserved); + TRACE("(%ld, %s, %ld)\n", restriction, debugstr_a(url), reserved); if (url) { DWORD len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0); urlW = heap_alloc(len * sizeof(WCHAR)); diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index f148a27619e..d1405a6bb53 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -274,14 +274,14 @@ static HRESULT WINAPI InstanceObjectFactory_IClassFactory_CreateInstance(IClassF hr = CoCreateInstance(&This->m_clsidInstance, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag); if (FAILED(hr)) { - TRACE("Failed to create instance of %s. hr = %08x\n", + TRACE("Failed to create instance of %s. hr = %08lx\n", debugstr_guid(&This->m_clsidInstance), hr); return hr; } hr = IPersistPropertyBag_Load(pPersistPropertyBag, This->m_pPropertyBag, NULL); if (FAILED(hr)) { - TRACE("Failed to initialize object from PropertyBag: hr = %08x\n", hr); + TRACE("Failed to initialize object from PropertyBag: hr = %08lx\n", hr); IPersistPropertyBag_Release(pPersistPropertyBag); return hr; }

1 0

Eric Pouech : shlwapi: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 119f261b1804ce3bdf0caadb62d2925db4b9ad3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=119f261b1804ce3bdf0caadb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:21 2022 +0100 shlwapi: 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/shlwapi/Makefile.in | 2 +- dlls/shlwapi/assoc.c | 12 ++--- dlls/shlwapi/clist.c | 6 +-- dlls/shlwapi/msgbox.c | 6 +-- dlls/shlwapi/ordinal.c | 106 ++++++++++++++++++++++---------------------- dlls/shlwapi/path.c | 22 ++++----- dlls/shlwapi/reg.c | 4 +- dlls/shlwapi/regstream.c | 12 ++--- dlls/shlwapi/shlwapi_main.c | 8 ++-- dlls/shlwapi/stopwatch.c | 6 +-- dlls/shlwapi/string.c | 8 ++-- dlls/shlwapi/thread.c | 6 +-- dlls/shlwapi/url.c | 2 +- 13 files changed, 100 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=119f261b1804ce3bdf0c…

1 0

Eric Pouech : snmpapi: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 36052f010895727530babfe3b447b21e95994a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36052f010895727530babfe3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:28 2022 +0100 snmpapi: 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/snmpapi/Makefile.in | 1 - dlls/snmpapi/main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index ea92b1d6bf3..eaee9374cfe 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = snmpapi.dll IMPORTLIB = snmpapi diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 1fd98c3da8d..7020c606228 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -120,7 +120,7 @@ BOOL WINAPI DllMain( DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p,%d,%p)\n", hInstDLL, fdwReason, lpvReserved); + TRACE("(%p,%ld,%p)\n", hInstDLL, fdwReason, lpvReserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: @@ -572,14 +572,14 @@ VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) switch (any->asnType) { case ASN_NULL: TRACE("Null value\n"); return; - case ASN_INTEGER32: TRACE("Integer32 %d\n", any->asnValue.number); return; - case ASN_UNSIGNED32: TRACE("Unsigned32 %u\n", any->asnValue.unsigned32); return; - case ASN_COUNTER32: TRACE("Counter32 %u\n", any->asnValue.counter); return; - case ASN_GAUGE32: TRACE("Gauge32 %u\n", any->asnValue.gauge); return; - case ASN_TIMETICKS: TRACE("Timeticks %u\n", any->asnValue.ticks); return; + case ASN_INTEGER32: TRACE("Integer32 %ld\n", any->asnValue.number); return; + case ASN_UNSIGNED32: TRACE("Unsigned32 %lu\n", any->asnValue.unsigned32); return; + case ASN_COUNTER32: TRACE("Counter32 %lu\n", any->asnValue.counter); return; + case ASN_GAUGE32: TRACE("Gauge32 %lu\n", any->asnValue.gauge); return; + case ASN_TIMETICKS: TRACE("Timeticks %lu\n", any->asnValue.ticks); return; case ASN_COUNTER64: { - TRACE("Counter64 %x%08x\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); + TRACE("Counter64 %lx%08lx\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); return; } case ASN_OCTETSTRING:

1 0

Eric Pouech : spoolss: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 940297d622f60ccb7e68d684fe690d0f1fcb4b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=940297d622f60ccb7e68d684… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:39 2022 +0100 spoolss: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/Makefile.in | 1 - dlls/spoolss/router.c | 28 ++++++++++++++-------------- dlls/spoolss/spoolss_main.c | 4 ++-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index a9a9ef8b723..d09836cbae6 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 24314b1f23a..4930a7eb18d 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -238,7 +238,7 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) used_backends++; backend[id]->index = used_backends; LeaveCriticalSection(&backend_cs); - TRACE("--> backend #%d: %p (%s)\n", id, backend[id], debugstr_w(dllname)); + TRACE("--> backend #%ld: %p (%s)\n", id, backend[id], debugstr_w(dllname)); return backend[id]; } } @@ -250,7 +250,7 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) heap_free(backend[id]); backend[id] = NULL; LeaveCriticalSection(&backend_cs); - WARN("failed to init %s: %u\n", debugstr_w(dllname), GetLastError()); + WARN("failed to init %s: %lu\n", debugstr_w(dllname), GetLastError()); return NULL; } @@ -307,7 +307,7 @@ static backend_t * backend_first(LPWSTR name) } } - FIXME("server %s not supported in %d backends\n", debugstr_w(name), used_backends); + FIXME("server %s not supported in %ld backends\n", debugstr_w(name), used_backends); LeaveCriticalSection(&backend_cs); return NULL; } @@ -335,7 +335,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p)\n", debugstr_w(pName), Level, pMonitors); + TRACE("(%s, %ld, %p)\n", debugstr_w(pName), Level, pMonitors); if (Level != 2) { SetLastError(ERROR_INVALID_LEVEL); @@ -350,7 +350,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -375,7 +375,7 @@ BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo, D backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); + TRACE("(%s, %ld, %p, 0x%lx)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); if (!pDriverInfo) { SetLastError(ERROR_INVALID_PARAMETER); @@ -390,7 +390,7 @@ BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo, D SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -424,7 +424,7 @@ BOOL WINAPI DeleteMonitorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorNam SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -452,7 +452,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbB backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors, + TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pMonitors, cbBuf, pcbNeeded, pcReturned); if (pcbNeeded) *pcbNeeded = 0; @@ -466,7 +466,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbB SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte for %u entries)\n\n", res, GetLastError(), + TRACE("got %lu with %lu (%lu byte for %lu entries)\n\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); return (res == ROUTER_SUCCESS); @@ -496,7 +496,7 @@ BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pPorts, cbBuf, + TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pPorts, cbBuf, pcbNeeded, pcReturned); if (pcbNeeded) *pcbNeeded = 0; @@ -510,7 +510,7 @@ BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte for %u entries)\n", res, GetLastError(), + TRACE("got %lu with %lu (%lu byte for %lu entries)\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); return (res == ROUTER_SUCCESS); @@ -550,7 +550,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), + TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); if (pcbNeeded) *pcbNeeded = 0; @@ -564,7 +564,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte)\n", + TRACE("got %lu with %lu (%lu byte)\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0); return (res == ROUTER_SUCCESS); diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index bc02b43ff62..355bf72b822 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -43,7 +43,7 @@ static HMODULE hwinspool; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: { @@ -121,7 +121,7 @@ LPVOID WINAPI DllAllocSplMem(DWORD size) LPVOID res; res = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - TRACE("(%d) => %p\n", size, res); + TRACE("(%ld) => %p\n", size, res); return res; }

1 0

Eric Pouech : sti: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 125760501f8392f1818901add53aa46ab1fffdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=125760501f8392f1818901ad… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:51 2022 +0100 sti: 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/sti/Makefile.in | 1 - dlls/sti/sti.c | 14 +++++++------- dlls/sti/sti_main.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index 162205a5bf6..f6e542c64d5 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sti.dll IMPORTLIB = sti IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index 0bb60382979..e079b9f2bb8 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -70,7 +70,7 @@ static ULONG WINAPI stillimagew_Release(IStillImageW *iface) static HRESULT WINAPI stillimagew_Initialize(IStillImageW *iface, HINSTANCE hinst, DWORD dwVersion) { stillimage *This = impl_from_IStillImageW(iface); - TRACE("(%p, %p, 0x%X)\n", This, hinst, dwVersion); + TRACE("(%p, %p, 0x%lX)\n", This, hinst, dwVersion); return S_OK; } @@ -78,7 +78,7 @@ static HRESULT WINAPI stillimagew_GetDeviceList(IStillImageW *iface, DWORD dwTyp DWORD *pdwItemsReturned, LPVOID *ppBuffer) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %u, 0x%X, %p, %p): stub\n", This, dwType, dwFlags, pdwItemsReturned, ppBuffer); + FIXME("(%p, %lu, 0x%lX, %p, %p): stub\n", This, dwType, dwFlags, pdwItemsReturned, ppBuffer); return E_NOTIMPL; } @@ -94,7 +94,7 @@ static HRESULT WINAPI stillimagew_CreateDevice(IStillImageW *iface, LPWSTR pwszD PSTIDEVICEW *pDevice, LPUNKNOWN pUnkOuter) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %s, %u, %p, %p): stub\n", This, debugstr_w(pwszDeviceName), dwMode, pDevice, pUnkOuter); + FIXME("(%p, %s, %lu, %p, %p): stub\n", This, debugstr_w(pwszDeviceName), dwMode, pDevice, pUnkOuter); return E_NOTIMPL; } @@ -111,7 +111,7 @@ static HRESULT WINAPI stillimagew_SetDeviceValue(IStillImageW *iface, LPWSTR pws DWORD type, LPBYTE pData, DWORD cbData) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %s, %s, %u, %p, %u): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pValueName), + FIXME("(%p, %s, %s, %lu, %p, %lu): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pValueName), type, pData, cbData); return E_NOTIMPL; } @@ -223,7 +223,7 @@ static HRESULT WINAPI stillimagew_SetupDeviceParameters(IStillImageW *iface, PST static HRESULT WINAPI stillimagew_WriteToErrorLog(IStillImageW *iface, DWORD dwMessageType, LPCWSTR pszMessage) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %u, %s): stub\n", This, dwMessageType, debugstr_w(pszMessage)); + FIXME("(%p, %lu, %s): stub\n", This, dwMessageType, debugstr_w(pszMessage)); return E_NOTIMPL; } @@ -307,7 +307,7 @@ static const struct IUnknownVtbl internal_unk_vtbl = */ HRESULT WINAPI StiCreateInstanceA(HINSTANCE hinst, DWORD dwVer, PSTIA *ppSti, LPUNKNOWN pUnkOuter) { - FIXME("(%p, %u, %p, %p): stub, unimplemented on Windows Vista too, please report if it's needed\n", hinst, dwVer, ppSti, pUnkOuter); + FIXME("(%p, %lu, %p, %p): stub, unimplemented on Windows Vista too, please report if it's needed\n", hinst, dwVer, ppSti, pUnkOuter); return STG_E_UNIMPLEMENTEDFUNCTION; } @@ -319,7 +319,7 @@ HRESULT WINAPI StiCreateInstanceW(HINSTANCE hinst, DWORD dwVer, PSTIW *ppSti, LP stillimage *This; HRESULT hr; - TRACE("(%p, %u, %p, %p)\n", hinst, dwVer, ppSti, pUnkOuter); + TRACE("(%p, %lu, %p, %p)\n", hinst, dwVer, ppSti, pUnkOuter); This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(stillimage)); if (This) diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index 61118e910b6..4ae8a337f8a 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -135,7 +135,7 @@ static sti_cf the_sti_cf = { { &sti_cf_vtbl }, sti_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %ld, %p)\n",hInstDLL,fdwReason,lpvReserved); return STI_DllMain(hInstDLL, fdwReason, lpvReserved); }

1 0

Eric Pouech : storage.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: fcfab4e5a902a4f8cac356778244feee4b310d79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcfab4e5a902a4f8cac35677… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:57 2022 +0100 storage.dll16: 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/storage.dll16/Makefile.in | 1 - dlls/storage.dll16/storage.c | 58 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/storage.dll16/Makefile.in b/dlls/storage.dll16/Makefile.in index 69a06475c55..f390aca7dd9 100644 --- a/dlls/storage.dll16/Makefile.in +++ b/dlls/storage.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = storage.dll16 IMPORTS = uuid ole32 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 1bcc72065ce..d2f91a77b46 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -345,12 +345,12 @@ STORAGE_get_big_block(stream_access16 *str,int n,BYTE *block) if ((SetFilePointer( str->hf, (n+1)*BIGSIZE, NULL, SEEK_SET ) == INVALID_SET_FILE_POINTER) && GetLastError()) { - WARN("(%p,%d,%p), seek failed (%d)\n",str->hf, n, block, GetLastError()); + WARN("(%p,%d,%p), seek failed (%ld)\n",str->hf, n, block, GetLastError()); return FALSE; } if (!ReadFile( str->hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE) { - WARN("(hf=%p, block size %d): read didn't read (%d)\n",str->hf,n,GetLastError()); + WARN("(hf=%p, block size %d): read didn't read (%ld)\n",str->hf,n,GetLastError()); return FALSE; } } else { @@ -374,7 +374,7 @@ STORAGE_get_big_block(stream_access16 *str,int n,BYTE *block) (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %lx\n",hres); return FALSE; } memcpy(block, MapSL(args[3]), BIGSIZE); @@ -406,7 +406,7 @@ _ilockbytes16_writeat(SEGPTR lockbytes, DWORD offset, DWORD length, void *buffer (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::WriteAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::WriteAt() failed, hres %lx\n",hres); return FALSE; } UnMapLS(args[3]); @@ -426,12 +426,12 @@ STORAGE_put_big_block(stream_access16 *str,int n,BYTE *block) if ((SetFilePointer( str->hf, (n+1)*BIGSIZE, NULL, SEEK_SET ) == INVALID_SET_FILE_POINTER) && GetLastError()) { - WARN("seek failed (%d)\n",GetLastError()); + WARN("seek failed (%ld)\n",GetLastError()); return FALSE; } if (!WriteFile( str->hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE) { - WARN(" write failed (%d)\n",GetLastError()); + WARN(" write failed (%ld)\n",GetLastError()); return FALSE; } return TRUE; @@ -710,9 +710,9 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) { return; TRACE("name: %s\n",name); TRACE("type: %d\n",stde->pps_type); - TRACE("prev pps: %d\n",stde->pps_prev); - TRACE("next pps: %d\n",stde->pps_next); - TRACE("dir pps: %d\n",stde->pps_dir); + TRACE("prev pps: %ld\n",stde->pps_prev); + TRACE("next pps: %ld\n",stde->pps_next); + TRACE("dir pps: %ld\n",stde->pps_dir); TRACE("guid: %s\n",debugstr_guid(&(stde->pps_guid))); if (stde->pps_type !=2) { time_t t; @@ -724,8 +724,8 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) { t = dw; TRACE("ts2: %s\n",ctime(&t)); } - TRACE("startblock: %d\n",stde->pps_sb); - TRACE("size: %d\n",stde->pps_size); + TRACE("startblock: %ld\n",stde->pps_sb); + TRACE("size: %ld\n",stde->pps_size); } /****************************************************************************** @@ -1102,7 +1102,7 @@ _ilockbytes16_addref(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::AddRef() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::AddRef() failed, hres %lx\n",hres); } static void @@ -1120,7 +1120,7 @@ _ilockbytes16_release(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::Release() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::Release() failed, hres %lx\n",hres); } static void @@ -1138,7 +1138,7 @@ _ilockbytes16_flush(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::Flush() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::Flush() failed, hres %lx\n",hres); } /****************************************************************************** @@ -1176,7 +1176,7 @@ HRESULT CDECL IStream16_fnSeek(IStream16 *iface, LARGE_INTEGER offset, DWORD whe ULARGE_INTEGER *newpos) { IStream16Impl *This = impl_from_IStream16(iface); - TRACE_(relay)("(%p)->([%d.%d],%d,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); + TRACE_(relay)("(%p)->([%ld.%ld],%ld,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); switch (whence) { case STREAM_SEEK_SET: @@ -1213,7 +1213,7 @@ HRESULT CDECL IStream16_fnRead(IStream16 *iface, void *pv, ULONG cb, ULONG *pcbR int blocknr; LPBYTE pbv = pv; - TRACE_(relay)("(%p)->(%p,%d,%p)\n",This,pv,cb,pcbRead); + TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbRead); if (!pcbRead) bytesread=&xxread; *bytesread = 0; @@ -1277,7 +1277,7 @@ HRESULT CDECL IStream16_fnWrite(IStream16 *iface, const void *pv, ULONG cb, ULON if (!pcbWrite) byteswritten=&xxwritten; *byteswritten = 0; - TRACE_(relay)("(%p)->(%p,%d,%p)\n",This,pv,cb,pcbWrite); + TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbWrite); /* do we need to junk some blocks? */ newsize = This->offset.u.LowPart+cb; oldsize = This->stde.pps_size; @@ -1647,7 +1647,7 @@ HRESULT CDECL IStorage16_fnStat(IStorage16 *iface, STATSTG16 *pstatstg, DWORD gr DWORD len = WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, NULL, 0, NULL, NULL ); LPSTR nameA = HeapAlloc( GetProcessHeap(), 0, len ); - TRACE("(%p)->(%p,0x%08x)\n", + TRACE("(%p)->(%p,0x%08lx)\n", This,pstatstg,grfStatFlag ); WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, nameA, len, NULL, NULL ); @@ -1671,7 +1671,7 @@ HRESULT CDECL IStorage16_fnStat(IStorage16 *iface, STATSTG16 *pstatstg, DWORD gr HRESULT CDECL IStorage16_fnCommit(IStorage16 *iface, DWORD commitflags) { IStorage16Impl *This = impl_from_IStorage16(iface); - FIXME("(%p)->(0x%08x),STUB!\n", + FIXME("(%p)->(0x%08lx),STUB!\n", This,commitflags ); return S_OK; @@ -1684,7 +1684,7 @@ HRESULT CDECL IStorage16_fnCopyTo(IStorage16 *iface, DWORD ciidExclude, const II SNB16 SNB16Exclude, IStorage16 *pstgDest) { IStorage16Impl *This = impl_from_IStorage16(iface); - FIXME("IStorage16(%p)->(0x%08x,%s,%p,%p),stub!\n", + FIXME("IStorage16(%p)->(0x%08lx,%s,%p,%p),stub!\n", This,ciidExclude,debugstr_guid(rgiidExclude),SNB16Exclude,pstgDest ); return S_OK; @@ -1706,7 +1706,7 @@ HRESULT CDECL IStorage16_fnCreateStorage(IStorage16 *iface, LPCOLESTR16 pwcsName int nPPSEntries; READ_HEADER(&This->str); - TRACE("(%p)->(%s,0x%08x,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n", This,pwcsName,grfMode,dwStgFormat,reserved2,ppstg ); if (grfMode & STGM_TRANSACTED) @@ -1773,7 +1773,7 @@ HRESULT CDECL IStorage16_fnCreateStream(IStorage16 *iface, LPCOLESTR16 pwcsName, BOOL ret; int nPPSEntries; - TRACE("(%p)->(%s,0x%08x,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n", This,pwcsName,grfMode,reserved1,reserved2,ppstm ); if (grfMode & STGM_TRANSACTED) @@ -1835,7 +1835,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, WCHAR name[33]; int newpps; - TRACE("(%p)->(%s,%p,0x%08x,%p,0x%08x,%p)\n", + TRACE("(%p)->(%s,%p,0x%08lx,%p,0x%08lx,%p)\n", This,pwcsName,pstgPrio,grfMode,snbExclude,reserved,ppstg ); if (grfMode & STGM_TRANSACTED) @@ -1877,7 +1877,7 @@ HRESULT CDECL IStorage16_fnOpenStream(IStorage16 *iface, LPCOLESTR16 pwcsName, v WCHAR name[33]; int newpps; - TRACE("(%p)->(%s,%p,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,%p,0x%08lx,0x%08lx,%p)\n", This,pwcsName,reserved1,grfMode,reserved2,ppstm ); if (grfMode & STGM_TRANSACTED) @@ -1990,13 +1990,13 @@ HRESULT WINAPI StgCreateDocFile16( IStorage16Impl* lpstg; struct storage_pps_entry stde; - TRACE("(%s,0x%08x,0x%08x,%p)\n", + TRACE("(%s,0x%08lx,0x%08lx,%p)\n", pwcsName,grfMode,reserved,ppstgOpen ); _create_istorage16(ppstgOpen); hf = CreateFileA(pwcsName,GENERIC_READ|GENERIC_WRITE,0,NULL,CREATE_NEW,0,0); if (hf==INVALID_HANDLE_VALUE) { - WARN("couldn't open file for storage:%d\n",GetLastError()); + WARN("couldn't open file for storage:%ld\n",GetLastError()); return E_FAIL; } lpstg = MapSL((SEGPTR)*ppstgOpen); @@ -2051,7 +2051,7 @@ HRESULT WINAPI StgOpenStorage16( IStorage16Impl* lpstg; struct storage_pps_entry stde; - TRACE("(%s,%p,0x%08x,%p,%d,%p)\n", + TRACE("(%s,%p,0x%08lx,%p,%ld,%p)\n", pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstgOpen ); _create_istorage16(ppstgOpen); @@ -2106,7 +2106,7 @@ HRESULT WINAPI StgIsStorageILockBytes16(SEGPTR plkbyt) (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %lx\n",hres); return hres; } if (memcmp(MapSL(args[3]), STORAGE_magic, sizeof(STORAGE_magic)) == 0) { @@ -2135,7 +2135,7 @@ HRESULT WINAPI StgOpenStorageOnILockBytes16( int i,ret; struct storage_pps_entry stde; - FIXME("(%x, %p, 0x%08x, %d, %x, %p)\n", plkbyt, pstgPriority, grfMode, (int)snbExclude, reserved, ppstgOpen); + FIXME("(%lx, %p, 0x%08lx, %d, %lx, %p)\n", plkbyt, pstgPriority, grfMode, (int)snbExclude, reserved, ppstgOpen); if ((plkbyt == 0) || (ppstgOpen == 0)) return STG_E_INVALIDPOINTER;

1 0

Eric Pouech : sxs: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 334b3f2b5c645340c4910b068c5e483e2e8c333b URL: https://source.winehq.org/git/wine.git/?a=commit;h=334b3f2b5c645340c4910b06… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:10 2022 +0100 sxs: 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/sxs/Makefile.in | 1 - dlls/sxs/cache.c | 22 +++++++++++----------- dlls/sxs/name.c | 12 ++++++------ dlls/sxs/sxs.c | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 27a5c58bdd0..867ea270f3d 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index e4fdda8c860..02403501231 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -203,7 +203,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( unsigned int len; HRESULT hr; - TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(assembly_name), info); + TRACE("%p, 0x%08lx, %s, %p\n", iface, flags, debugstr_w(assembly_name), info); if (flags || (info && info->cbAssemblyInfo != sizeof(*info))) return E_INVALIDARG; @@ -272,7 +272,7 @@ static HRESULT WINAPI cache_CreateAssemblyCacheItem( IAssemblyCacheItem **item, LPCWSTR name ) { - FIXME("%p, 0x%08x, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); + FIXME("%p, 0x%08lx, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); return E_NOTIMPL; } @@ -363,7 +363,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) hr = IXMLDOMNodeList_get_length( list, &len ); if (hr != S_OK) goto done; - TRACE("found %d files\n", len); + TRACE("found %ld files\n", len); if (!len) { hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; @@ -530,7 +530,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly if (!ret) { HRESULT hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy policy manifest file 0x%08x\n", hr); + WARN("failed to copy policy manifest file 0x%08lx\n", hr); return hr; } return S_OK; @@ -619,7 +619,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy manifest file 0x%08x\n", hr); + WARN("failed to copy manifest file 0x%08lx\n", hr); return hr; } @@ -652,7 +652,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy file 0x%08x\n", hr); + WARN("failed to copy file 0x%08lx\n", hr); goto done; } } @@ -674,7 +674,7 @@ static HRESULT WINAPI cache_InstallAssembly( IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; - TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(path), ref); + TRACE("%p, 0x%08lx, %s, %p\n", iface, flags, debugstr_w(path), ref); cache_lock( cache ); init = CoInitialize( NULL ); @@ -724,7 +724,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) lstrcatW( filename, backslashW ); lstrcatW( filename, file->name ); - if (!DeleteFileW( filename )) WARN( "failed to delete file %u\n", GetLastError() ); + if (!DeleteFileW( filename )) WARN( "failed to delete file %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, filename ); } RemoveDirectoryW( dirname ); @@ -751,7 +751,7 @@ static HRESULT WINAPI cache_UninstallAssembly( const WCHAR *arch, *name, *token, *type, *version; WCHAR *p, *path = NULL; - TRACE("%p, 0x%08x, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp); + TRACE("%p, 0x%08lx, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp); if (ref) { @@ -790,7 +790,7 @@ static HRESULT WINAPI cache_UninstallAssembly( if ((hr = load_manifest( doc, path )) != S_OK) goto done; if ((hr = parse_assembly( doc, &assembly )) != S_OK) goto done; - if (!DeleteFileW( path )) WARN( "unable to remove manifest file %u\n", GetLastError() ); + if (!DeleteFileW( path )) WARN( "unable to remove manifest file %lu\n", GetLastError() ); else if ((p = wcsrchr( path, '\\' ))) { *p = 0; @@ -827,7 +827,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) { struct cache *cache; - TRACE("%p, %u\n", obj, reserved); + TRACE("%p, %lu\n", obj, reserved); if (!obj) return E_INVALIDARG; diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 0fab45c5018..29368b6d788 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -104,7 +104,7 @@ static HRESULT WINAPI name_SetProperty( LPVOID property, DWORD size ) { - FIXME("%p, %d, %p, %d\n", iface, id, property, size); + FIXME("%p, %ld, %p, %ld\n", iface, id, property, size); return E_NOTIMPL; } @@ -114,7 +114,7 @@ static HRESULT WINAPI name_GetProperty( LPVOID buffer, LPDWORD buflen ) { - FIXME("%p, %d, %p, %p\n", iface, id, buffer, buflen); + FIXME("%p, %ld, %p, %p\n", iface, id, buffer, buflen); return E_NOTIMPL; } @@ -135,7 +135,7 @@ static HRESULT WINAPI name_GetDisplayName( struct name *name = impl_from_IAssemblyName( iface ); unsigned int len; - TRACE("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + TRACE("%p, %p, %p, 0x%08lx\n", iface, buffer, buflen, flags); if (!buflen || flags) return E_INVALIDARG; @@ -169,7 +169,7 @@ static HRESULT WINAPI name_Reserved( DWORD cbReserved, LPVOID *ppReserved ) { - FIXME("%p, %s, %p, %p, %s, %s, %p, %d, %p\n", iface, + FIXME("%p, %s, %p, %p, %s, %s, %p, %ld, %p\n", iface, debugstr_guid(riid), pUnkReserved1, pUnkReserved2, debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); @@ -262,7 +262,7 @@ static HRESULT WINAPI name_IsEqual( IAssemblyName *name2, DWORD flags ) { - FIXME("%p, %p, 0x%08x\n", name1, name2, flags); + FIXME("%p, %p, 0x%08lx\n", name1, name2, flags); return E_NOTIMPL; } @@ -368,7 +368,7 @@ HRESULT WINAPI CreateAssemblyNameObject( struct name *name; HRESULT hr; - TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); + TRACE("%p, %s, 0x%08lx, %p\n", obj, debugstr_w(assembly), flags, reserved); if (!obj) return E_INVALIDARG; diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 2fa4dc0262b..934aa9345c8 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -104,7 +104,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff char *ret_strings; ULONG_PTR cookie; - TRACE("%#x, %s, %p, %p, %lx, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, + TRACE("%#lx, %s, %p, %p, %Ix, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX)

1 0

Eric Pouech : shell32: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 570e24a014f16dd8b5ea8d0ca45937d68276e7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=570e24a014f16dd8b5ea8d0c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:09 2022 +0100 shell32: 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/shell32/Makefile.in | 2 +- dlls/shell32/appbar.c | 6 +-- dlls/shell32/assoc.c | 34 ++++++++--------- dlls/shell32/autocomplete.c | 6 +-- dlls/shell32/brsfolder.c | 16 ++++---- dlls/shell32/changenotify.c | 16 ++++---- dlls/shell32/classes.c | 2 +- dlls/shell32/control.c | 6 +-- dlls/shell32/cpanelfolder.c | 36 +++++++++--------- dlls/shell32/dataobject.c | 14 +++---- dlls/shell32/debughlp.c | 6 +-- dlls/shell32/dragdrophelper.c | 12 +++--- dlls/shell32/ebrowser.c | 38 +++++++++---------- dlls/shell32/enumidlist.c | 10 ++--- dlls/shell32/folders.c | 4 +- dlls/shell32/iconcache.c | 6 +-- dlls/shell32/pidl.c | 32 ++++++++-------- dlls/shell32/recyclebin.c | 14 +++---- dlls/shell32/shell32_main.c | 34 ++++++++--------- dlls/shell32/shelldispatch.c | 84 ++++++++++++++++++++--------------------- dlls/shell32/shellitem.c | 34 ++++++++--------- dlls/shell32/shelllink.c | 48 +++++++++++------------ dlls/shell32/shellole.c | 32 ++++++++-------- dlls/shell32/shellord.c | 64 +++++++++++++++---------------- dlls/shell32/shellpath.c | 84 ++++++++++++++++++++--------------------- dlls/shell32/shellstring.c | 8 ++-- dlls/shell32/shfldr_desktop.c | 24 ++++++------ dlls/shell32/shfldr_fs.c | 30 +++++++-------- dlls/shell32/shfldr_mycomp.c | 30 +++++++-------- dlls/shell32/shfldr_netplaces.c | 26 ++++++------- dlls/shell32/shfldr_printers.c | 16 ++++---- dlls/shell32/shlexec.c | 26 ++++++------- dlls/shell32/shlfileop.c | 16 ++++---- dlls/shell32/shlfolder.c | 24 ++++++------ dlls/shell32/shlfsbind.c | 4 +- dlls/shell32/shlmenu.c | 20 +++++----- dlls/shell32/shlview.c | 50 ++++++++++++------------ dlls/shell32/shlview_cmenu.c | 14 +++---- dlls/shell32/systray.c | 6 +-- 39 files changed, 467 insertions(+), 467 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=570e24a014f16dd8b5ea…

1 0