- Wine-Devel - list.winehq.org

[PATCH v2] winhttp: Use lock when attempting to send frame synchronously().
by Paul Gofman Feb. 3, 2022

Feb. 3, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 225419. While web socket sends are not actually supposed to be queued before the previous one completed, send for pongs or socket shutdown may be called in parallel. Only the first call will go for synchronous send attempt but the next queued call have a chance of hitting socket_send() before the first sync one returns. The sync outside of send_frame() (which is needed if the send wasn't completed synchronously) is provided by the queueing logic around pending_sends counter. v2: - lock before incrementing and checking pending_sends, unlock after pending_sends is finalized (but before sending app callback). This way we are guaranteed that: - sync send is never attempted if async is queued; - attempt to execute next send will come to pending_sends increment only if the concurring send is complete or queued (so in the latter case that next send will be queued as well). dlls/winhttp/request.c | 15 +++++++++++---- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 728b1895ba7..a3a6389a938 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3111,6 +3111,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.callback = request->hdr.callback; socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; + InitializeSRWLock( &socket->send_lock ); addref_object( &request->hdr ); socket->request = request; @@ -3391,6 +3392,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ERROR_OUTOFMEMORY; } + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3; if (!async_send) { @@ -3419,10 +3421,11 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ free( s ); } } - else + else InterlockedDecrement( &socket->hdr.pending_sends ); + ReleaseSRWLockExclusive( &socket->send_lock ); + if (!async_send) { TRACE("sent sync.\n"); - InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); socket_send_complete( socket, ret, type, len ); ret = ERROR_SUCCESS; @@ -3535,6 +3538,7 @@ static DWORD socket_send_pong( struct socket *socket ) if (!(s = malloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1; if (!async_send) { @@ -3563,6 +3567,7 @@ static DWORD socket_send_pong( struct socket *socket ) InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); } + ReleaseSRWLockExclusive( &socket->send_lock ); return ret; } return send_frame( socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, NULL ); @@ -3817,6 +3822,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v if (!(s = malloc( sizeof(*s) ))) return FALSE; + AcquireSRWLockExclusive( &socket->send_lock ); async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3; if (!async_send) { @@ -3845,9 +3851,10 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v free( s ); } } - else + else InterlockedDecrement( &socket->hdr.pending_sends ); + ReleaseSRWLockExclusive( &socket->send_lock ); + if (!async_send) { - InterlockedDecrement( &socket->hdr.pending_sends ); free( s ); if (send_callback) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 3e4e1eb298d..732f0afaa88 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -259,6 +259,7 @@ struct socket unsigned int send_remaining_size; unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; + SRWLOCK send_lock; }; struct send_request -- 2.34.1

2 1

[v2 PATCH 09/17] mfplat: Use correct integral types.
by Nikolay Sivov Feb. 3, 2022

Feb. 3, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 7 ++++--- dlls/mfplat/main.c | 8 +++++--- dlls/mfplat/mediatype.c | 26 +++++++++++++++----------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 9081dc39eab..f161bb29d80 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -49,7 +49,7 @@ struct buffer struct { BYTE *linear_buffer; - unsigned int plane_size; + DWORD plane_size; BYTE *scanline0; unsigned int width; @@ -1306,9 +1306,10 @@ static p_copy_image_func get_2d_buffer_copy_func(DWORD fourcc) static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - unsigned int stride, max_length, plane_size; - struct buffer *object; + unsigned int stride, max_length; unsigned int row_alignment; + struct buffer *object; + DWORD plane_size; GUID subtype; BOOL is_yuv; HRESULT hr; diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e2f892ed91d..e79f59d41dd 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -702,9 +702,10 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; - DWORD size, ret; WCHAR str[250]; UINT8 *blob; + UINT32 size; + DWORD ret; guid_to_string(buffer, clsid); swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer); @@ -6094,8 +6095,9 @@ static const IRtwqAsyncCallbackVtbl source_resolver_callback_url_vtbl = static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void **handler) { - unsigned int j = 0, name_length, type; + DWORD name_length, type; HRESULT hr = E_FAIL; + unsigned int j = 0; WCHAR clsidW[39]; CLSID clsid; @@ -9207,7 +9209,7 @@ static ULONGLONG lldiv128(ULARGE_INTEGER c1, ULARGE_INTEGER c0, LONGLONG denom) { ULARGE_INTEGER q1, q0, rhat; ULARGE_INTEGER v, cmp1, cmp2; - unsigned int s = 0; + DWORD s = 0; v.QuadPart = llabs(denom); diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 4f24ccbd237..41dbda572d5 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2926,8 +2926,10 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value))) format->nChannels = value; - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->nSamplesPerSec); - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &format->nAvgBytesPerSec); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value))) + format->nSamplesPerSec = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &value))) + format->nAvgBytesPerSec = value; if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value))) format->nBlockAlign = value; if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value))) @@ -2939,7 +2941,8 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value))) format_ext->Samples.wSamplesPerBlock = value; - IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &format_ext->dwChannelMask); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &value))) + format_ext->dwChannelMask = value; memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat)); } @@ -3085,8 +3088,8 @@ HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *format, IMFAudioMediaT return S_OK; } -static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator, - UINT32 *denominator) +static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, DWORD *numerator, + DWORD *denominator) { UINT64 value; @@ -3102,7 +3105,7 @@ static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UIN */ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size) { - UINT32 flags, palette_size = 0, avgrate; + UINT32 flags, palette_size = 0, value; MFVIDEOFORMAT *format; INT32 stride; GUID guid; @@ -3162,11 +3165,12 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&stride)) && stride < 0) format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &avgrate))) - format->compressedInfo.AvgBitrate = avgrate; - if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &avgrate))) - format->compressedInfo.AvgBitErrorRate = avgrate; - IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &format->compressedInfo.MaxKeyFrameSpacing); + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &value))) + format->compressedInfo.AvgBitrate = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &value))) + format->compressedInfo.AvgBitErrorRate = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &value))) + format->compressedInfo.MaxKeyFrameSpacing = value; /* Palette. */ if (palette_size) -- 2.34.1

1 0

[PATCH 1/5] shell32: Move SHWaitForFileToOpen() flags to shellord.c.
by Zebediah Figura Feb. 3, 2022

Feb. 3, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shellord.c | 5 +++++ dlls/shell32/undocshell.h | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 2c73ce18940..a138f381a92 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -50,6 +50,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); +/* SHWaitForFileToOpen flags */ +#define SHWFF_ADD 0x01 +#define SHWFF_REMOVE 0x02 +#define SHWFF_WAIT 0x04 + /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */ /* !!! it is in both here and comctl32undoc.c !!! */ typedef struct tagCREATEMRULIST diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 5ed8d25f234..459c51c8454 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -208,16 +208,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); * Misc Stuff */ -/* SHWaitForFileToOpen flags */ -#define SHWFF_ADD 0x01 -#define SHWFF_REMOVE 0x02 -#define SHWFF_WAIT 0x04 - -BOOL WINAPI SHWaitForFileToOpen( - LPCITEMIDLIST pidl, - DWORD dwFlags, - DWORD dwTimeout); - WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, WORD cKids, const HWND *lpKids); -- 2.34.1

2 6

[PATCH 1/4] quartz/tests: Test more interfaces exposed by the filter graph.
by Zebediah Figura Feb. 3, 2022

Feb. 3, 2022

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index bd086445a3b..98f7b30717d 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -98,23 +98,30 @@ static void test_interfaces(void) IFilterGraph2 *graph = create_graph(); check_interface(graph, &IID_IBasicAudio, TRUE); + check_interface(graph, &IID_IBasicVideo, TRUE); check_interface(graph, &IID_IBasicVideo2, TRUE); + check_interface(graph, &IID_IFilterGraph, TRUE); check_interface(graph, &IID_IFilterGraph2, TRUE); check_interface(graph, &IID_IFilterMapper, TRUE); + check_interface(graph, &IID_IFilterMapper2, TRUE); check_interface(graph, &IID_IFilterMapper3, TRUE); + check_interface(graph, &IID_IGraphBuilder, TRUE); check_interface(graph, &IID_IGraphConfig, TRUE); check_interface(graph, &IID_IGraphVersion, TRUE); check_interface(graph, &IID_IMediaControl, TRUE); check_interface(graph, &IID_IMediaEvent, TRUE); - check_interface(graph, &IID_IMediaFilter, TRUE); + check_interface(graph, &IID_IMediaEventEx, TRUE); check_interface(graph, &IID_IMediaEventSink, TRUE); + check_interface(graph, &IID_IMediaFilter, TRUE); check_interface(graph, &IID_IMediaPosition, TRUE); check_interface(graph, &IID_IMediaSeeking, TRUE); check_interface(graph, &IID_IObjectWithSite, TRUE); check_interface(graph, &IID_IVideoFrameStep, TRUE); check_interface(graph, &IID_IVideoWindow, TRUE); + check_interface(graph, &IID_IUnknown, TRUE); check_interface(graph, &IID_IBaseFilter, FALSE); + check_interface(graph, &IID_IDispatch, FALSE); IFilterGraph2_Release(graph); } -- 2.34.1

2 4

[PATCH] sane: Fix memory leak in create_item (Coverity)
by Alex Henrie Feb. 3, 2022

Feb. 3, 2022

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/sane.ds/ui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 8be7ed42b70..e66526a088e 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -318,6 +318,7 @@ static int create_item(HDC hdc, const struct option_descriptor *opt, if (trail_edit) *count+=1; + free(trail_edit); return leading_len + local_len + padding + padding2 + trail_len; } -- 2.35.1

2 3

[v2 PATCH 06/17] mf: Use correct integral types.
by Nikolay Sivov Feb. 3, 2022

Feb. 3, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/copier.c | 4 ++-- dlls/mf/evr.c | 4 ++-- dlls/mf/main.c | 3 ++- dlls/mf/sar.c | 7 ++++--- dlls/mf/session.c | 31 +++++++++++++++++-------------- dlls/mf/topology.c | 11 ++++++----- 6 files changed, 33 insertions(+), 27 deletions(-) diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index b05ae3383ab..fe5664ee4c7 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -247,7 +247,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputAvailableType(IMFTransfor return hr; } -static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, DWORD *size) +static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, UINT32 *size) { GUID major, subtype; UINT64 frame_size; @@ -281,7 +281,7 @@ static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, DWORD *size) static HRESULT sample_copier_set_media_type(struct sample_copier *transform, BOOL input, DWORD id, IMFMediaType *type, DWORD flags) { - DWORD buffer_size; + UINT32 buffer_size; HRESULT hr = S_OK; if (id) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 9552990006d..5e8b559af04 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1633,8 +1633,8 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) if (SUCCEEDED(hr)) { - unsigned int input_count, output_count; - unsigned int *ids, *oids; + DWORD input_count, output_count; + DWORD *ids, *oids; size_t i; /* Create stream sinks for inputs that mixer already has by default. */ diff --git a/dlls/mf/main.c b/dlls/mf/main.c index acbb8377e52..50451170275 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1072,10 +1072,11 @@ static int __cdecl qsort_string_compare(const void *a, const void *b) static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int maxlen, PROPVARIANT *dst) { static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; - unsigned int capacity = 0, count, size; + unsigned int capacity = 0, count; HRESULT hr = S_OK; int i, index; WCHAR *buffW; + DWORD size; if (!(buffW = calloc(maxlen, sizeof(*buffW)))) return E_OUTOFMEMORY; diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index f6f2b32dd2d..3c9bac90c9f 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1493,7 +1493,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IM IMFMediaType *in_type, IMFMediaType **out_type) { struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); - unsigned int flags; + DWORD flags; HRESULT hr; TRACE("%p, %p, %p.\n", iface, in_type, out_type); @@ -1618,8 +1618,8 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMF struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); const unsigned int test_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; BOOL compare_result; - unsigned int flags; HRESULT hr = S_OK; + DWORD flags; TRACE("%p, %p.\n", iface, media_type); @@ -1777,11 +1777,12 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len; + unsigned int src_frames, dst_frames, max_frames, pad_frames; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; IMFMediaBuffer *buffer; BYTE *dst, *src; + DWORD src_len; HRESULT hr; LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 66009b1fff2..756ef381373 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -185,7 +185,7 @@ struct topo_node struct { IMFMediaSource *source; - unsigned int stream_id; + DWORD stream_id; } source; struct { @@ -197,11 +197,11 @@ struct topo_node struct { struct transform_stream *inputs; - unsigned int *input_map; + DWORD *input_map; unsigned int input_count; struct transform_stream *outputs; - unsigned int *output_map; + DWORD *output_map; unsigned int output_count; } transform; } u; @@ -867,8 +867,9 @@ static void session_start(struct media_session *session, const GUID *time_format static void session_set_started(struct media_session *session) { struct media_source *source; - unsigned int caps, flags; IMFMediaEvent *event; + unsigned int caps; + DWORD flags; session->state = SESSION_STATE_STARTED; @@ -1181,17 +1182,18 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology return S_OK; } -static unsigned int transform_node_get_stream_id(struct topo_node *node, BOOL output, unsigned int index) +static DWORD transform_node_get_stream_id(struct topo_node *node, BOOL output, unsigned int index) { - unsigned int *map = output ? node->u.transform.output_map : node->u.transform.input_map; + DWORD *map = output ? node->u.transform.output_map : node->u.transform.input_map; return map ? map[index] : index; } static HRESULT session_set_transform_stream_info(struct topo_node *node) { - unsigned int *input_map = NULL, *output_map = NULL; - unsigned int i, input_count, output_count, block_alignment; + DWORD *input_map = NULL, *output_map = NULL; + DWORD i, input_count, output_count; struct transform_stream *streams; + unsigned int block_alignment; IMFMediaType *media_type; GUID major = { 0 }; HRESULT hr; @@ -2132,7 +2134,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface); struct topo_node *topo_node; IMFTopologyNode *upstream_node; - unsigned int upstream_output; + DWORD upstream_output; EnterCriticalSection(&session->cs); @@ -2462,8 +2464,8 @@ static void session_set_source_object_state(struct media_session *session, IUnkn struct media_sink *sink; enum object_state state; struct topo_node *node; - unsigned int i, count; BOOL changed = FALSE; + DWORD i, count; HRESULT hr; if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID) @@ -2668,10 +2670,11 @@ static struct sample *transform_create_sample(IMFSample *sample) static HRESULT transform_get_external_output_sample(const struct media_session *session, struct topo_node *transform, unsigned int output_index, const MFT_OUTPUT_STREAM_INFO *stream_info, IMFSample **sample) { - unsigned int buffer_size, downstream_input; IMFTopologyNode *downstream_node; IMFMediaBuffer *buffer = NULL; struct topo_node *topo_node; + unsigned int buffer_size; + DWORD downstream_input; TOPOID node_id; HRESULT hr; @@ -2713,9 +2716,9 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, MFT_OUTPUT_STREAM_INFO stream_info; MFT_OUTPUT_DATA_BUFFER *buffers; struct sample *queued_sample; + HRESULT hr = E_UNEXPECTED; DWORD status = 0; unsigned int i; - HRESULT hr = E_UNEXPECTED; if (!(buffers = calloc(node->u.transform.output_count, sizeof(*buffers)))) return E_OUTOFMEMORY; @@ -2888,7 +2891,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *node, DWORD output) { IMFTopologyNode *downstream_node, *upstream_node; - unsigned int downstream_input, upstream_output; + DWORD downstream_input, upstream_output; struct topo_node *topo_node; MF_TOPOLOGY_TYPE node_type; struct sample *sample; @@ -3537,8 +3540,8 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess struct media_source *source; struct media_sink *sink; float value = 0.0f, tmp; - unsigned int flags; HRESULT hr = S_OK; + DWORD flags; if (!nearest_rate) nearest_rate = &tmp; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index f97c0cc75d3..8eb1b763e64 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2381,8 +2381,9 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size) { IMFTopologyNode *downstream_node, *node, *orig_node; - unsigned int input_index, size = 0; MF_TOPOLOGY_TYPE node_type; + unsigned int size = 0; + DWORD input_index; HRESULT hr = S_OK; TOPOID id; @@ -2444,7 +2445,7 @@ static BOOL topology_loader_is_node_d3d_aware(IMFTopologyNode *node) return !!d3d_aware; } -static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, unsigned int upstream_output, +static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, DWORD upstream_output, IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform **copier) { IMFMediaType *input_type = NULL, *output_type = NULL; @@ -2483,7 +2484,7 @@ static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, uns } static HRESULT topology_loader_connect_copier(struct topoloader_context *context, IMFTopologyNode *upstream_node, - unsigned int upstream_output, IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform *copier) + DWORD upstream_output, IMFTopologyNode *downstream_node, DWORD downstream_input, IMFTransform *copier) { IMFTopologyNode *copier_node; HRESULT hr; @@ -2506,9 +2507,9 @@ static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context IMFTopologyNode *node) { IMFTopologyNode *upstream_node; - unsigned int upstream_output; - IMFStreamSink *stream_sink; IMFTransform *copier = NULL; + IMFStreamSink *stream_sink; + DWORD upstream_output; HRESULT hr; if (FAILED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) -- 2.34.1

1 0

[PATCH 1/2] tools: headers should be within a consistent includedir.
by Kevin Puetz Feb. 3, 2022

Feb. 3, 2022

A wine installation should not be divided across multiple prefixes, and one shouldn't mix components from multiple installations. winegcc should therefore select a single viable get_inc_dir (as was with get_lib_dir) and add (only) its ${includedir}/wine/msvcrt and ${includedir}/wine/windows, not offer gcc multiple (potentially nonexistent or unrelated) paths to search for wine headers Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> -- e.g. for a wine built with --prefix /opt/wine-6 it's potentially the case that /usr/include/wine/* may also exist (perhaps from a distro package), but we don't really want winegcc adding both -I/opt/wine-6/include/windows -I/usr/include/wine/windows get_inc_dir is identical in all winegcc/widl/wrc tools, and thus seems like a good candidate to move into tools.h. However, its interactions with init_argv0_dir (includedir global variable, INCLUDDIR macro, etc) made that not really work out. --- tools/widl/widl.c | 39 ++++++++++++++++++++++------------ tools/winegcc/winegcc.c | 47 ++++++++++++++++++++++++----------------- tools/wrc/wrc.c | 39 ++++++++++++++++++++++------------ 3 files changed, 80 insertions(+), 45 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7686594b7d3..8150d6158e4 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -256,6 +256,29 @@ static void add_widl_version_define(void) wpp_add_cmdline_define(version_str); } +static const char *get_inc_dir(const char *sysroot) +{ + const char *stdincpath[] = { includedir, INCLUDEDIR, "/usr/include", "/usr/local/include" }; + const char *root = sysroot ? sysroot : ""; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(stdincpath); i++) + { + const char *root = (sysroot && i) ? sysroot : ""; + char *path; + struct stat statbuf; + + if (!stdincpath[i]) continue; + path = strmake( "%s%s/%s",root, stdincpath[i], "wine"); + if (!stat(path,&statbuf) && S_ISDIR(statbuf.st_mode)) + { + return strmake( "%s%s",root,stdincpath[i]); + } + } + + return strmake( "%s%s", root, INCLUDEDIR ); +} + /* clean things up when aborting on a signal */ static void exit_on_signal( int sig ) { @@ -733,19 +756,9 @@ int main(int argc,char *argv[]) if (stdinc) { - static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; - - if (includedir) - { - wpp_add_include_path( strmake( "%s/wine/msvcrt", includedir )); - wpp_add_include_path( strmake( "%s/wine/windows", includedir )); - } - for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) - { - if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; - wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); - wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); - } + const char *inc_dir = get_inc_dir(sysroot); + wpp_add_include_path( strmake( "%s/wine/msvcrt", inc_dir)); + wpp_add_include_path( strmake( "%s/wine/windows", inc_dir)); } if (pointer_size) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 8644afe7535..6e701a5c08b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -647,6 +647,29 @@ static char *get_lib_dir( struct options *opts ) return strmake( "%s%s", root, LIBDIR ); } +static const char *get_inc_dir(const char *sysroot) +{ + const char *stdincpath[] = { includedir, INCLUDEDIR, "/usr/include", "/usr/local/include" }; + const char *root = sysroot ? sysroot : ""; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(stdincpath); i++) + { + const char *root = (sysroot && i) ? sysroot : ""; + char *path; + struct stat statbuf; + + if (!stdincpath[i]) continue; + path = strmake( "%s%s/%s",root, stdincpath[i], "wine"); + if (!stat(path,&statbuf) && S_ISDIR(statbuf.st_mode)) + { + return strmake( "%s%s",root,stdincpath[i]); + } + } + + return strmake( "%s%s", root, INCLUDEDIR ); +} + static void init_argv0_dir( const char *argv0 ) { #ifndef _WIN32 @@ -813,32 +836,18 @@ no_compat_defines: /* standard includes come last in the include search path */ if (!opts->wine_objdir && !opts->nostdinc) { - const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; - const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; + const char *inc_sysroot = opts->isysroot ? opts->isysroot : opts->sysroot; + const char *inc_dir = get_inc_dir(inc_sysroot); const char *isystem = gcc_defs ? "-isystem" : "-I"; const char *idirafter = gcc_defs ? "-idirafter" : "-I"; if (opts->use_msvcrt) { - if (includedir) strarray_add( &comp_args, strmake( "%s%s/wine/msvcrt", isystem, includedir )); - for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) - { - if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(&comp_args, strmake( "%s%s%s/wine/msvcrt", isystem, root, incl_dirs[j] )); - } + strarray_add(&comp_args, strmake( "%s%s/wine/msvcrt", isystem, inc_dir )); strarray_add(&comp_args, "-D__MSVCRT__"); } - if (includedir) - { - strarray_add( &comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); - strarray_add( &comp_args, strmake( "%s%s", idirafter, includedir )); - } - for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) - { - if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(&comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); - strarray_add(&comp_args, strmake( "%s%s%s", idirafter, root, incl_dirs[j] )); - } + strarray_add(&comp_args, strmake( "%s%s/wine/windows", isystem, inc_dir )); + strarray_add(&comp_args, strmake( "%s%s", idirafter, inc_dir)); } else if (opts->wine_objdir) strarray_add(&comp_args, strmake("-I%s/include", opts->wine_objdir) ); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 41207120237..3b38629c71b 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -225,6 +225,29 @@ static void set_version_defines(void) free( version ); } +static const char *get_inc_dir(const char *sysroot) +{ + const char *stdincpath[] = { includedir, INCLUDEDIR, "/usr/include", "/usr/local/include" }; + const char *root = sysroot ? sysroot : ""; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(stdincpath); i++) + { + const char *root = (sysroot && i) ? sysroot : ""; + char *path; + struct stat statbuf; + + if (!stdincpath[i]) continue; + path = strmake( "%s%s/%s",root, stdincpath[i], "wine"); + if (!stat(path,&statbuf) && S_ISDIR(statbuf.st_mode)) + { + return strmake( "%s%s",root,stdincpath[i]); + } + } + + return strmake( "%s%s", root, INCLUDEDIR ); +} + /* clean things up when aborting on a signal */ static void exit_on_signal( int sig ) { @@ -453,19 +476,9 @@ int main(int argc,char *argv[]) /* If we do need to search standard includes, add them to the path */ if (stdinc) { - static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; - - if (includedir) - { - wpp_add_include_path( strmake( "%s/wine/msvcrt", includedir )); - wpp_add_include_path( strmake( "%s/wine/windows", includedir )); - } - for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) - { - if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; - wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); - wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); - } + const char *inc_dir = get_inc_dir(sysroot); + wpp_add_include_path( strmake( "%s/wine/msvcrt", inc_dir)); + wpp_add_include_path( strmake( "%s/wine/windows", inc_dir)); } /* Kill io buffering when some kind of debuglevel is enabled */ -- 2.34.1

2 2

Fwd: Alexandre Julliard : configure: Enable 64-bit time_t on Linux.
by Eric Pouech Feb. 3, 2022

Feb. 3, 2022

this breaks here <<<< config.log configure:13562: result: /lib/cpp configure:13576: /lib/cpp conftest.c In file included from /usr/include/features.h:392, from /usr/include/bits/libc-header-start.h:33, from /usr/include/limits.h:26, from /usr/lib/gcc/x86_64-redhat-linux/11/include/limits.h:203, from /usr/lib/gcc/x86_64-redhat-linux/11/include/syslimits.h:7, from /usr/lib/gcc/x86_64-redhat-linux/11/include/limits.h:34, from conftest.c:97: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Module: wine Branch: master Commit: 2211ca9fa57640b4c19c0a6aa57fda94328c53c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2211ca9fa57640b4c19c0a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 2 13:23:21 2022 +0100 configure: Enable 64-bit time_t on Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

1 0

[PATCH] libs/wine: Only define exe_link when needed
by Gerald Pfeifer Feb. 3, 2022

Feb. 3, 2022

Revision 24b26f8bd6a49c855eec417a6585d44c9458e3ec changed FreeBSD (and DragonFly) not to use /proc any longer. Hence we also do not need the exe_link variable on those two platforms, either. Avoid declaring it there. (Spotted by GCC 12.) Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- libs/wine/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 23c76fda128..69a783967df 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -60,7 +60,7 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) static const char exe_link[] = "/proc/self/exe"; -#else +#elseif ! defined (__FreeBSD__) && ! defined(__DragonFly__) static const char exe_link[] = ""; #endif -- 2.34.1

2 1

[PATCH] xactengine: Fix long types warnings.
by Alistair Leslie-Hughes Feb. 3, 2022

Feb. 3, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine2_0/Makefile.in | 2 +- dlls/xactengine2_4/Makefile.in | 2 +- dlls/xactengine2_7/Makefile.in | 2 +- dlls/xactengine2_9/Makefile.in | 2 +- dlls/xactengine3_0/Makefile.in | 2 +- dlls/xactengine3_1/Makefile.in | 2 +- dlls/xactengine3_2/Makefile.in | 2 +- dlls/xactengine3_3/Makefile.in | 2 +- dlls/xactengine3_4/Makefile.in | 2 +- dlls/xactengine3_5/Makefile.in | 2 +- dlls/xactengine3_6/Makefile.in | 2 +- dlls/xactengine3_7/Makefile.in | 2 +- dlls/xactengine3_7/xact_dll.c | 44 +++++++++++++++++----------------- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/xactengine2_0/Makefile.in b/dlls/xactengine2_0/Makefile.in index 1fe077c95a3..5c4b635b060 100644 --- a/dlls/xactengine2_0/Makefile.in +++ b/dlls/xactengine2_0/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine2_0.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0200 +EXTRADEFS = -DXACT3_VER=0x0200 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine2_4/Makefile.in b/dlls/xactengine2_4/Makefile.in index 78e78146311..2b5fd547b61 100644 --- a/dlls/xactengine2_4/Makefile.in +++ b/dlls/xactengine2_4/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine2_4.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0204 +EXTRADEFS = -DXACT3_VER=0x0204 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine2_7/Makefile.in b/dlls/xactengine2_7/Makefile.in index 445ba17f6ae..6861555b23b 100644 --- a/dlls/xactengine2_7/Makefile.in +++ b/dlls/xactengine2_7/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine2_7.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0207 +EXTRADEFS = -DXACT3_VER=0x0207 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine2_9/Makefile.in b/dlls/xactengine2_9/Makefile.in index 0f8e137ffba..e5f8c83e962 100644 --- a/dlls/xactengine2_9/Makefile.in +++ b/dlls/xactengine2_9/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine2_9.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0209 +EXTRADEFS = -DXACT3_VER=0x0209 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in index 60673ff8101..10259e44ee0 100644 --- a/dlls/xactengine3_0/Makefile.in +++ b/dlls/xactengine3_0/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_0.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0300 +EXTRADEFS = -DXACT3_VER=0x0300 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in index f812bea5c9b..3105c3443bd 100644 --- a/dlls/xactengine3_1/Makefile.in +++ b/dlls/xactengine3_1/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_1.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0301 +EXTRADEFS = -DXACT3_VER=0x0301 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in index bde069efe30..92481ba1e26 100644 --- a/dlls/xactengine3_2/Makefile.in +++ b/dlls/xactengine3_2/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_2.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0302 +EXTRADEFS = -DXACT3_VER=0x0302 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in index 1bdfc72b1b7..1963f033557 100644 --- a/dlls/xactengine3_3/Makefile.in +++ b/dlls/xactengine3_3/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_3.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0303 +EXTRADEFS = -DXACT3_VER=0x0303 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in index 5987dc0df78..5d639c4e7ad 100644 --- a/dlls/xactengine3_4/Makefile.in +++ b/dlls/xactengine3_4/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_4.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0304 +EXTRADEFS = -DXACT3_VER=0x0304 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in index 5a95ceb9e30..47731dd7017 100644 --- a/dlls/xactengine3_5/Makefile.in +++ b/dlls/xactengine3_5/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_5.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0305 +EXTRADEFS = -DXACT3_VER=0x0305 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in index dfca6ac31d4..b0e235ecd08 100644 --- a/dlls/xactengine3_6/Makefile.in +++ b/dlls/xactengine3_6/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_6.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0306 +EXTRADEFS = -DXACT3_VER=0x0306 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in index 18ef2a683e8..128a41cf59a 100644 --- a/dlls/xactengine3_7/Makefile.in +++ b/dlls/xactengine3_7/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_7.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0307 +EXTRADEFS = -DXACT3_VER=0x0307 C_SRCS = \ xact_dll.c diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 18608037ffb..98c3cf8f076 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -75,7 +75,7 @@ static HRESULT WINAPI IXACT3CueImpl_Stop(IXACT3Cue *iface, DWORD dwFlags) { XACT3CueImpl *This = impl_from_IXACT3Cue(iface); - TRACE("(%p)->(%u)\n", iface, dwFlags); + TRACE("(%p)->(%lu)\n", iface, dwFlags); return FACTCue_Stop(This->fact_cue, dwFlags); } @@ -86,7 +86,7 @@ static HRESULT WINAPI IXACT3CueImpl_GetState(IXACT3Cue *iface, DWORD *pdwState) TRACE("(%p)->(%p)\n", iface, pdwState); - return FACTCue_GetState(This->fact_cue, pdwState); + return FACTCue_GetState(This->fact_cue, (uint32_t *)pdwState); } static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface) @@ -108,7 +108,7 @@ static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface) static HRESULT WINAPI IXACT3CueImpl_GetChannelMap(IXACT3Cue *iface, XACTCHANNELMAP *map, DWORD size, DWORD *needed_size) { - FIXME("(%p)->(%p, %u, %p)\n", iface, map, size, needed_size); + FIXME("(%p)->(%p, %lu, %p)\n", iface, map, size, needed_size); return E_NOTIMPL; } @@ -306,7 +306,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, FACTCue *fcue; UINT ret; - TRACE("(%p)->(%u, 0x%x, %u, %p)\n", This, nCueIndex, dwFlags, timeOffset, + TRACE("(%p)->(%u, 0x%lx, %lu, %p)\n", This, nCueIndex, dwFlags, timeOffset, ppCue); ret = FACTSoundBank_Prepare(This->fact_soundbank, nCueIndex, dwFlags, @@ -343,7 +343,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, FACTCue *fcue; HRESULT hr; - TRACE("(%p)->(%u, 0x%x, %u, %p)\n", This, nCueIndex, dwFlags, timeOffset, + TRACE("(%p)->(%u, 0x%lx, %lu, %p)\n", This, nCueIndex, dwFlags, timeOffset, ppCue); /* If the application doesn't want a handle, don't generate one at all. @@ -380,7 +380,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Stop(IXACT3SoundBank *iface, { XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); - TRACE("(%p)->(%u)\n", This, dwFlags); + TRACE("(%p)->(%lu)\n", This, dwFlags); return FACTSoundBank_Stop(This->fact_soundbank, nCueIndex, dwFlags); } @@ -404,7 +404,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_GetState(IXACT3SoundBank *iface, TRACE("(%p)->(%p)\n", This, pdwState); - return FACTSoundBank_GetState(This->fact_soundbank, pdwState); + return FACTSoundBank_GetState(This->fact_soundbank, (uint32_t *)pdwState); } static const IXACT3SoundBankVtbl XACT3SoundBank_Vtbl = @@ -459,7 +459,7 @@ static HRESULT WINAPI IXACT3WaveImpl_Stop(IXACT3Wave *iface, DWORD dwFlags) { XACT3WaveImpl *This = impl_from_IXACT3Wave(iface); - TRACE("(%p)->(0x%x)\n", This, dwFlags); + TRACE("(%p)->(0x%lx)\n", This, dwFlags); return FACTWave_Stop(This->fact_wave, dwFlags); } @@ -479,7 +479,7 @@ static HRESULT WINAPI IXACT3WaveImpl_GetState(IXACT3Wave *iface, DWORD *pdwState TRACE("(%p)->(%p)\n", This, pdwState); - return FACTWave_GetState(This->fact_wave, pdwState); + return FACTWave_GetState(This->fact_wave, (uint32_t *)pdwState); } static HRESULT WINAPI IXACT3WaveImpl_SetPitch(IXACT3Wave *iface, XACTPITCH pitch) @@ -604,7 +604,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, FACTWave *fwave; UINT ret; - TRACE("(%p)->(0x%x, %u, 0x%x, %u, %p)\n", This, nWaveIndex, dwFlags, + TRACE("(%p)->(0x%x, %lu, 0x%lx, %u, %p)\n", This, nWaveIndex, dwFlags, dwPlayOffset, nLoopCount, ppWave); ret = FACTWaveBank_Prepare(This->fact_wavebank, nWaveIndex, dwFlags, @@ -641,7 +641,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, FACTWave *fwave; HRESULT hr; - TRACE("(%p)->(0x%x, %u, 0x%x, %u, %p)\n", This, nWaveIndex, dwFlags, dwPlayOffset, + TRACE("(%p)->(0x%x, %lu, 0x%lx, %u, %p)\n", This, nWaveIndex, dwFlags, dwPlayOffset, nLoopCount, ppWave); /* If the application doesn't want a handle, don't generate one at all. @@ -678,7 +678,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Stop(IXACT3WaveBank *iface, { XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); - TRACE("(%p)->(%u, %u)\n", This, nWaveIndex, dwFlags); + TRACE("(%p)->(%u, %lu)\n", This, nWaveIndex, dwFlags); return FACTWaveBank_Stop(This->fact_wavebank, nWaveIndex, dwFlags); } @@ -692,7 +692,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_GetState(IXACT3WaveBank *iface, TRACE("(%p)->(%p)\n", This, pdwState); - return FACTWaveBank_GetState(This->fact_wavebank, pdwState); + return FACTWaveBank_GetState(This->fact_wavebank, (uint32_t *)pdwState); } static const IXACT3WaveBankVtbl XACT3WaveBank_Vtbl = @@ -733,7 +733,7 @@ static int32_t FACTCALL wrap_readfile( { wrap_readfile_struct *wrap = (wrap_readfile_struct*) hFile; return wrap->engine->pReadFile(wrap->file, lpBuffer, nNumberOfBytesRead, - lpNumberOfBytesRead, (LPOVERLAPPED)lpOverlapped); + (DWORD *)lpNumberOfBytesRead, (LPOVERLAPPED)lpOverlapped); } static int32_t FACTCALL wrap_getoverlappedresult( @@ -744,7 +744,7 @@ static int32_t FACTCALL wrap_getoverlappedresult( { wrap_readfile_struct *wrap = (wrap_readfile_struct*) hFile; return wrap->engine->pGetOverlappedResult(wrap->file, (LPOVERLAPPED)lpOverlapped, - lpNumberOfBytesTransferred, bWait); + (DWORD *)lpNumberOfBytesTransferred, bWait); } static inline XACT3EngineImpl *impl_from_IXACT3Engine(IXACT3Engine *iface) @@ -780,7 +780,7 @@ static ULONG WINAPI IXACT3EngineImpl_AddRef(IXACT3Engine *iface) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); ULONG ref = FACTAudioEngine_AddRef(This->fact_engine); - TRACE("(%p)->(): Refcount now %u\n", This, ref); + TRACE("(%p)->(): Refcount now %lu\n", This, ref); return ref; } @@ -789,7 +789,7 @@ static ULONG WINAPI IXACT3EngineImpl_Release(IXACT3Engine *iface) XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); ULONG ref = FACTAudioEngine_Release(This->fact_engine); - TRACE("(%p)->(): Refcount now %u\n", This, ref); + TRACE("(%p)->(): Refcount now %lu\n", This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -936,7 +936,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, FACTSoundBank *fsb; UINT ret; - TRACE("(%p)->(%p, %u, 0x%x, 0x%x, %p): stub!\n", This, pvBuffer, dwSize, dwFlags, + TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p): stub!\n", This, pvBuffer, dwSize, dwFlags, dwAllocAttributes, ppSoundBank); ret = FACTAudioEngine_CreateSoundBank(This->fact_engine, pvBuffer, dwSize, @@ -973,7 +973,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac FACTWaveBank *fwb; UINT ret; - TRACE("(%p)->(%p, %u, 0x%x, 0x%x, %p)\n", This, pvBuffer, dwSize, dwFlags, + TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p)\n", This, pvBuffer, dwSize, dwFlags, dwAllocAttributes, ppWaveBank); ret = FACTAudioEngine_CreateInMemoryWaveBank(This->fact_engine, pvBuffer, @@ -1082,7 +1082,7 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, FACTWave *fwave = NULL; UINT ret; - TRACE("(%p)->(0x%08x, %s, %d, %d, %d, %d, %p)\n", This, dwFlags, debugstr_a(szWavePath), + TRACE("(%p)->(0x%08lx, %s, %d, %ld, %ld, %d, %p)\n", This, dwFlags, debugstr_a(szWavePath), wStreamingPacketSize, dwAlignment, dwPlayOffset, nLoopCount, ppWave); ret = FACTAudioEngine_PrepareWave(This->fact_engine, dwFlags, szWavePath, wStreamingPacketSize, @@ -1278,7 +1278,7 @@ static HRESULT WINAPI IXACT3EngineImpl_Stop(IXACT3Engine *iface, { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - TRACE("(%p)->(%u, 0x%x)\n", This, nCategory, dwFlags); + TRACE("(%p)->(%u, 0x%lx)\n", This, nCategory, dwFlags); return FACTAudioEngine_Stop(This->fact_engine, nCategory, dwFlags); } @@ -1460,7 +1460,7 @@ static IClassFactory XACTFactory = { &XACT3CF_Vtbl }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) { - TRACE("(%p, %d, %p)\n", hinstDLL, reason, pReserved); + TRACE("(%p, %ld, %p)\n", hinstDLL, reason, pReserved); switch (reason) { -- 2.34.1

2 1