October 2023 - Wine-Commits

Rémi Bernon : dmime: Output DMUS_MIDI_PMSG into a music buffer on the port.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: a4b006e723528036822f241911533bd6e8f67062 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4b006e723528036822f241911533b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 6 09:44:26 2023 +0200 dmime: Output DMUS_MIDI_PMSG into a music buffer on the port. --- dlls/dmime/performance.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2018fa013de..782f300eb4b 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1637,6 +1637,39 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, switch (msg->dwType) { + case DMUS_PMSGT_MIDI: + { + static const UINT event_size = sizeof(DMUS_EVENTHEADER) + sizeof(DWORD); + DMUS_BUFFERDESC desc = {.dwSize = sizeof(desc), .cbBuffer = 2 * event_size}; + DMUS_MIDI_PMSG *midi = (DMUS_MIDI_PMSG *)msg; + IDirectMusicBuffer *buffer; + IDirectMusicPort *port; + DWORD group, channel; + UINT value = 0; + + if (FAILED(hr = IDirectMusicPerformance_PChannelInfo(performance, msg->dwPChannel, + &port, &group, &channel))) + { + WARN("Failed to get message port, hr %#lx\n", hr); + return DMUS_S_FREE; + } + + value |= channel; + value |= (UINT)midi->bStatus; + value |= (UINT)midi->bByte1 << 8; + value |= (UINT)midi->bByte2 << 16; + + if (SUCCEEDED(hr = IDirectMusic_CreateMusicBuffer(This->dmusic, &desc, &buffer, NULL))) + { + hr = IDirectMusicBuffer_PackStructured(buffer, msg->rtTime, group, value); + if (SUCCEEDED(hr)) hr = IDirectMusicPort_PlayBuffer(port, buffer); + IDirectMusicBuffer_Release(buffer); + } + + IDirectMusicPort_Release(port); + break; + } + case DMUS_PMSGT_NOTIFICATION: { DMUS_NOTIFICATION_PMSG *notif = (DMUS_NOTIFICATION_PMSG *)msg;

1 0

Rémi Bernon : dmime: Translate DMUS_PMSGT_PATCH to DMUS_PMSGT_MIDI messages.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: a6710afc26f599c5e3e592e452032f1d3a0ab4c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6710afc26f599c5e3e592e452032f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 09:10:48 2023 +0200 dmime: Translate DMUS_PMSGT_PATCH to DMUS_PMSGT_MIDI messages. --- dlls/dmime/performance.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b12a8315330..63429023da2 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1715,6 +1715,25 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, break; } + case DMUS_PMSGT_PATCH: + { + DMUS_PATCH_PMSG *patch = (DMUS_PATCH_PMSG *)msg; + + if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_REFTIME | DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, + 0xb0 /* Control Change */, 0x00 /* CC: Bank MSB */, patch->byMSB))) + WARN("Failed to translate message to MIDI, hr %#lx\n", hr); + + if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_REFTIME | DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, + 0xb0 /* Control Change */, 0x20 /* CC: Bank LSB */, patch->byLSB))) + WARN("Failed to translate message to MIDI, hr %#lx\n", hr); + + if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_REFTIME | DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, + 0xc0 /* Program Change */, patch->byInstrument, 0))) + WARN("Failed to translate message to MIDI, hr %#lx\n", hr); + + break; + } + case DMUS_PMSGT_NOTIFICATION: { DMUS_NOTIFICATION_PMSG *notif = (DMUS_NOTIFICATION_PMSG *)msg;

1 0

Rémi Bernon : dmime: Implement sequence track IDirectMusicTrack_Play.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: fd68076c36555d97593213a024d6ab6246de6e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd68076c36555d97593213a024d6ab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 00:04:46 2023 +0200 dmime: Implement sequence track IDirectMusicTrack_Play. --- dlls/dmime/seqtrack.c | 95 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/dmime/tests/dmime.c | 13 +------ 2 files changed, 91 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 21b78ff26cd..a6043cb4a89 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -108,13 +108,96 @@ static HRESULT WINAPI sequence_track_EndPlay(IDirectMusicTrack8 *iface, void *pS return S_OK; } -static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *pStateData, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, - IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) +static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *state_data, + MUSIC_TIME start_time, MUSIC_TIME end_time, MUSIC_TIME time_offset, DWORD segment_flags, + IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD track_id) { - struct sequence_track *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); - return S_OK; + struct sequence_track *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicGraph *graph; + HRESULT hr; + UINT i; + + TRACE("(%p, %p, %ld, %ld, %ld, %#lx, %p, %p, %ld)\n", This, state_data, start_time, end_time, + time_offset, segment_flags, performance, segment_state, track_id); + + if (start_time != 0) FIXME("start_time %ld not implemented\n", start_time); + if (end_time != -1) FIXME("end_time %ld not implemented\n", end_time); + if (time_offset != 0) FIXME("time_offset %ld not implemented\n", time_offset); + if (segment_flags) FIXME("segment_flags %#lx not implemented\n", segment_flags); + if (segment_state) FIXME("segment_state %p not implemented\n", segment_state); + + if (FAILED(hr = IDirectMusicPerformance_QueryInterface(performance, + &IID_IDirectMusicGraph, (void **)&graph))) + return hr; + + for (i = 0; SUCCEEDED(hr) &&i < This->count; i++) + { + DMUS_IO_SEQ_ITEM *item = This->items + i; + DMUS_NOTE_PMSG *msg; + + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*msg), + (DMUS_PMSG **)&msg))) + break; + + msg->mtTime = item->mtTime; + msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwPChannel = item->dwPChannel; + msg->dwVirtualTrackID = track_id; + msg->dwType = DMUS_PMSGT_NOTE; + msg->dwGroupID = 1; + msg->mtDuration = item->mtDuration; + msg->wMusicValue = item->bByte1; + msg->nOffset = item->nOffset; + msg->bVelocity = item->bByte2; + msg->bFlags = 1; + msg->bMidiValue = item->bByte1; + + if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg)) + || FAILED(hr = IDirectMusicPerformance_SendPMsg(performance, (DMUS_PMSG *)msg))) + { + IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)msg); + break; + } + } + + for (i = 0; SUCCEEDED(hr) &&i < This->curve_count; i++) + { + DMUS_IO_CURVE_ITEM *item = This->curve_items + i; + DMUS_CURVE_PMSG *msg; + + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*msg), + (DMUS_PMSG **)&msg))) + break; + + msg->mtTime = item->mtStart; + msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwPChannel = item->dwPChannel; + msg->dwVirtualTrackID = track_id; + msg->dwType = DMUS_PMSGT_CURVE; + msg->mtDuration = item->mtDuration; + msg->mtOriginalStart = item->mtStart; + msg->mtResetDuration = item->mtResetDuration; + msg->nStartValue = item->nStartValue; + msg->nEndValue = item->nEndValue; + msg->nResetValue = item->nResetValue; + msg->nOffset = item->nOffset; + msg->bType = item->bType; + msg->bCurveShape = item->bCurveShape; + msg->bCCData = item->bCCData; + msg->bFlags = item->bFlags; + msg->wParamType = item->wParamType; + msg->wMergeIndex = item->wMergeIndex; + + if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg)) + || FAILED(hr = IDirectMusicPerformance_SendPMsg(performance, (DMUS_PMSG *)msg))) + { + IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)msg); + break; + } + } + + IDirectMusicGraph_Release(graph); + return hr; } static HRESULT WINAPI sequence_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 412cccce781..6881eac80c6 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3502,30 +3502,21 @@ static void test_sequence_track(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&note); ok(!ret, "got %#lx\n", ret); - if (note->dwType == DMUS_PMSGT_NOTE) - { check_dmus_note_pmsg(note, 0, 0, 500, 60, 120); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)note); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&note); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_note_pmsg(note, 1000, 1, 200, 50, 100); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)note); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } IDirectMusicSegment_Release(segment);

1 0

Rémi Bernon : dmime: Implement band track IDirectMusicTrack_Play.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: e3b23cb66eaf0f63ce9ab351c1d7da1af0017225 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3b23cb66eaf0f63ce9ab351c1d7da… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 12 09:02:05 2023 +0200 dmime: Implement band track IDirectMusicTrack_Play. --- dlls/dmband/band.c | 34 ++++++++++++++++++++++++++++++++++ dlls/dmband/bandtrack.c | 38 +++++++++++++++++++++++++++----------- dlls/dmband/dmband_private.h | 2 ++ dlls/dmband/tests/dmband.c | 1 - dlls/dmime/tests/dmime.c | 18 +++--------------- 5 files changed, 66 insertions(+), 27 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 4b3c053c586..456bb20143e 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -486,3 +486,37 @@ HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollecti return S_OK; } + +HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance, + IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id) +{ + struct band *This = impl_from_IDirectMusicBand(iface); + struct instrument_entry *entry; + HRESULT hr = S_OK; + + LIST_FOR_EACH_ENTRY_REV(entry, &This->instruments, struct instrument_entry, entry) + { + DMUS_PATCH_PMSG *msg; + + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*msg), + (DMUS_PMSG **)&msg))) + break; + + msg->mtTime = time; + msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwPChannel = entry->instrument.dwPChannel; + msg->dwVirtualTrackID = track_id; + msg->dwType = DMUS_PMSGT_PATCH; + msg->dwGroupID = 1; + msg->byInstrument = entry->instrument.dwPatch; + + if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg)) + || FAILED(hr = IDirectMusicPerformance_SendPMsg(performance, (DMUS_PMSG *)msg))) + { + IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)msg); + break; + } + } + + return hr; +} diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 6233d39b9c0..e0acb6ff62d 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -159,22 +159,38 @@ static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *state_ } static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags, - IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, - DWORD virtual_id) + MUSIC_TIME start_time, MUSIC_TIME end_time, MUSIC_TIME time_offset, DWORD segment_flags, + IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD track_id) { struct band_track *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicGraph *graph; + struct band_entry *entry; + HRESULT hr; - FIXME("(%p, %p, %ld, %ld, %ld, %lx, %p, %p, %ld): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); + TRACE("(%p, %p, %ld, %ld, %ld, %#lx, %p, %p, %ld)\n", This, state_data, start_time, end_time, + time_offset, segment_flags, performance, segment_state, track_id); - /* Sends following pMSG: - - DMUS_PATCH_PMSG - - DMUS_TRANSPOSE_PMSG - - DMUS_CHANNEL_PRIORITY_PMSG - - DMUS_MIDI_PMSG - */ + if (!performance) return DMUS_S_END; - return S_OK; + if (start_time != 0) FIXME("start_time %ld not implemented\n", start_time); + if (end_time != -1) FIXME("end_time %ld not implemented\n", end_time); + if (time_offset != 0) FIXME("time_offset %ld not implemented\n", time_offset); + if (segment_flags) FIXME("segment_flags %#lx not implemented\n", segment_flags); + if (segment_state) FIXME("segment_state %p not implemented\n", segment_state); + + if (FAILED(hr = IDirectMusicPerformance_QueryInterface(performance, + &IID_IDirectMusicGraph, (void **)&graph))) + return hr; + + LIST_FOR_EACH_ENTRY(entry, &This->bands, struct band_entry, entry) + { + if (FAILED(hr = band_send_messages(entry->band, performance, graph, + entry->head.lBandTimeLogical, track_id))) + break; + } + + IDirectMusicGraph_Release(graph); + return hr; } static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index a12b9f8cc82..48c5ec02aeb 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -48,5 +48,7 @@ extern HRESULT create_dmband(REFIID riid, void **ret_iface); extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface); extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection); +extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance, + IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id); #endif /* __WINE_DMBAND_PRIVATE_H */ diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index ee45ca33714..d88606976e4 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -233,7 +233,6 @@ static void test_bandtrack(void) hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - todo_wine ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 6881eac80c6..6dc9d8e0f5e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3756,39 +3756,27 @@ static void test_band_track_play(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&patch); ok(!ret, "got %#lx\n", ret); - if (patch->dwType == DMUS_PMSGT_PATCH) - { check_dmus_patch_pmsg(patch, 0, 1, 0, 1); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)patch); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&patch); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_patch_pmsg(patch, 1000, 2, 0, 3); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)patch); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&patch); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_patch_pmsg(patch, 1000, 1, 0, 2); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)patch); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } IDirectMusicSegment_Release(segment);

1 0

Fabian Maurer : propsys: Implement PropVariantToUInt32WithDefault.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: d177709b10ce07ddd234b0e8e00764ae4b1d8488 URL: https://gitlab.winehq.org/wine/wine/-/commit/d177709b10ce07ddd234b0e8e00764… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Oct 8 19:35:44 2023 +0200 propsys: Implement PropVariantToUInt32WithDefault. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55713 --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 14 ++++++++++++++ dlls/propsys/tests/propsys.c | 9 +++++++++ include/propvarutil.h | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index b2d48a87577..20615dd3aed 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -145,7 +145,7 @@ @ stdcall PropVariantToUInt32(ptr ptr) @ stub PropVariantToUInt32Vector @ stub PropVariantToUInt32VectorAlloc -@ stub PropVariantToUInt32WithDefault +@ stdcall PropVariantToUInt32WithDefault(ptr long) @ stdcall PropVariantToUInt64(ptr ptr) @ stub PropVariantToUInt64Vector @ stub PropVariantToUInt64VectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index c6510f9f35d..8702d31561f 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -229,6 +229,20 @@ HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret) return hr; } +ULONG WINAPI PropVariantToUInt32WithDefault(REFPROPVARIANT propvarIn, ULONG ulDefault) +{ + LONGLONG res; + HRESULT hr; + + TRACE("%p,%lu\n", propvarIn, ulDefault); + + hr = PROPVAR_ConvertNumber(propvarIn, 32, FALSE, &res); + if (SUCCEEDED(hr)) + return (ULONG)res; + + return ulDefault; +} + HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) { LONGLONG res; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a2fbb619ef2..04816864080 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -966,6 +966,9 @@ static void test_intconversions(void) hr = PropVariantToUInt32(&propvar, &ulval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%lx\n", hr); + ulval = PropVariantToUInt32WithDefault(&propvar, 77); + ok(ulval == 77, "ulval=%lu\n", ulval); + hr = PropVariantToInt16(&propvar, &sval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%lx\n", hr); @@ -991,6 +994,9 @@ static void test_intconversions(void) ok(hr == S_OK, "hr=%lx\n", hr); ok(ulval == 5, "got wrong value %ld\n", ulval); + ulval = PropVariantToUInt32WithDefault(&propvar, 77); + ok(ulval == 5, "got wrong value %lu\n", ulval); + hr = PropVariantToInt16(&propvar, &sval); ok(hr == S_OK, "hr=%lx\n", hr); ok(sval == 5, "got wrong value %d\n", sval); @@ -1016,6 +1022,9 @@ static void test_intconversions(void) hr = PropVariantToUInt32(&propvar, &ulval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%lx\n", hr); + ulval = PropVariantToUInt32WithDefault(&propvar, 77); + ok(ulval == 77, "ulval=%lu\n", ulval); + hr = PropVariantToInt16(&propvar, &sval); ok(hr == S_OK, "hr=%lx\n", hr); ok(sval == -5, "got wrong value %d\n", sval); diff --git a/include/propvarutil.h b/include/propvarutil.h index 6c1878c6aa5..026304e3f15 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -89,6 +89,7 @@ HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); +ULONG WINAPI PropVariantToUInt32WithDefault(REFPROPVARIANT propvarIn, ULONG uLDefault); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb);

1 0

Alex Henrie : msvcrt/tests: Add tests for wcsdup.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: 9e76799266f454876aba52df43bf7343fde0671f URL: https://gitlab.winehq.org/wine/wine/-/commit/9e76799266f454876aba52df43bf73… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 11 09:18:37 2023 -0600 msvcrt/tests: Add tests for wcsdup. --- dlls/msvcrt/tests/string.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 10c7fea4439..cdc19736832 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -649,6 +649,15 @@ static void test_strdup(void) ok(errno == 0xdeadbeef, "errno is %d, expected 0xdeadbeef\n", errno); } +static void test_wcsdup(void) +{ + WCHAR *str; + errno = 0xdeadbeef; + str = wcsdup(0); + ok(str == 0, "wcsdup returned %s, expected NULL\n", wine_dbgstr_w(str)); + ok(errno == 0xdeadbeef, "errno is %d, expected 0xdeadbeef\n", errno); +} + static void test_strcmp(void) { int ret = p_strcmp( "abc", "abcd" ); @@ -4705,6 +4714,7 @@ START_TEST(string) test_mbsspn(); test_mbsspnp(); test_strdup(); + test_wcsdup(); test_strcmp(); test_strcpy_s(); test_memcpy_s();

1 0

Alex Henrie : msvcrt/tests: Check errno after strdup(NULL).
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: 1cade77fc4f4fb01f1d485ca33721f015f6c4ef5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cade77fc4f4fb01f1d485ca33721f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 11 09:18:37 2023 -0600 msvcrt/tests: Check errno after strdup(NULL). --- dlls/msvcrt/tests/string.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6a9dc23d4f0..10c7fea4439 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -642,10 +642,11 @@ static void test_mbsspnp( void) static void test_strdup(void) { - char *str; - str = _strdup( 0 ); - ok( str == 0, "strdup returns %s should be 0\n", str); - free( str ); + char *str; + errno = 0xdeadbeef; + str = strdup(0); + ok(str == 0, "strdup returned %s, expected NULL\n", wine_dbgstr_a(str)); + ok(errno == 0xdeadbeef, "errno is %d, expected 0xdeadbeef\n", errno); } static void test_strcmp(void)

1 0

Piotr Caban : localspl: Truncate output file when printing to file.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: dea831a24193464217e1c5705d2ef4775fd36cee URL: https://gitlab.winehq.org/wine/wine/-/commit/dea831a24193464217e1c5705d2ef4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 12 15:00:54 2023 +0200 localspl: Truncate output file when printing to file. --- dlls/localspl/localmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index e1e7153600d..bd95f22d979 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -542,7 +542,7 @@ static BOOL WINAPI localmon_StartDocPort(HANDLE hport, WCHAR *printer_name, } port->hfile = CreateFileW(doc_info->pOutputFile, GENERIC_WRITE, - FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); + FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); return port->hfile != INVALID_HANDLE_VALUE; }

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .in files.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: b6e502610a39f115a086533e5e93d5ba2a73a277 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6e502610a39f115a086533e5e93d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 11:02:17 2023 +0200 makefiles: Always use the global SOURCES variable for .in files. --- dlls/wineandroid.drv/Makefile.in | 11 +++-------- tools/Makefile.in | 6 ++---- tools/make_makefiles | 3 ++- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index abd893db71f..1eb209e92ff 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -3,18 +3,13 @@ UNIXLIB = wineandroid.so IMPORTS = ntoskrnl UNIX_LIBS = -lwin32u $(PTHREAD_LIBS) -C_SRCS = \ +SOURCES = \ + build.gradle.in \ device.c \ dllmain.c \ init.c \ keyboard.c \ opengl.c \ - window.c - -IN_SRCS = \ - build.gradle.in - -SVG_SRCS = \ + window.c \ wine.svg - EXTRA_TARGETS = wine-debug.apk diff --git a/tools/Makefile.in b/tools/Makefile.in index adf53bb2c51..cd643e7e90b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,8 +1,6 @@ PROGRAMS = \ make_xftmpl -C_SRCS = \ - make_xftmpl.c - -IN_SRCS = \ +SOURCES = \ + make_xftmpl.c \ wineapploader.in diff --git a/tools/make_makefiles b/tools/make_makefiles index 9e10220ad46..c114c30ed57 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -369,7 +369,8 @@ sub assign_sources_to_makefiles(@) } elsif ($name =~ /\.in$/) { - push @{${$make}{"=IN_SRCS"}}, $name; + push @{${$make}{"=SOURCES"}}, $name; + next; } elsif ($name =~ /\.spec$/) {

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .m files.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: 92fe7c9c9f218dda519f0d2952440627c61bdcdb URL: https://gitlab.winehq.org/wine/wine/-/commit/92fe7c9c9f218dda519f0d29524406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 10:55:01 2023 +0200 makefiles: Always use the global SOURCES variable for .m files. --- dlls/winemac.drv/Makefile.in | 27 ++++++++++++--------------- tools/make_makefiles | 3 +-- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 41b2234c39a..e3e71c5f4cc 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -14,8 +14,17 @@ UNIX_LIBS = \ -framework Security \ $(METAL_LIBS) -C_SRCS = \ +SOURCES = \ clipboard.c \ + cocoa_app.m \ + cocoa_clipboard.m \ + cocoa_cursorclipping.m \ + cocoa_display.m \ + cocoa_event.m \ + cocoa_main.m \ + cocoa_opengl.m \ + cocoa_status_item.m \ + cocoa_window.m \ display.c \ dllmain.c \ dragdrop.c \ @@ -29,17 +38,5 @@ C_SRCS = \ surface.c \ systray.c \ vulkan.c \ - window.c - -OBJC_SRCS = \ - cocoa_app.m \ - cocoa_clipboard.m \ - cocoa_cursorclipping.m \ - cocoa_display.m \ - cocoa_event.m \ - cocoa_main.m \ - cocoa_opengl.m \ - cocoa_status_item.m \ - cocoa_window.m - -RC_SRCS = winemac.rc + window.c \ + winemac.rc diff --git a/tools/make_makefiles b/tools/make_makefiles index eebb02da691..5b263c58d24 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.(mc|po)$/) + if ($name =~ /\.(m|mc|po)$/) { push @{${$make}{"=SOURCES"}}, $name; next; } - elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; }

1 0