January 2024 - Wine-commits

David Kahurani : gdiplus: Use path_list to path helper in GdipWidenPath.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 9164cf8fd9e7e6265474b124235b3a5387a5f105 URL: https://gitlab.winehq.org/wine/wine/-/commit/9164cf8fd9e7e6265474b124235b3a… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Sun Jan 7 00:03:36 2024 +0300 gdiplus: Use path_list to path helper in GdipWidenPath. The data is the path is invalid and therefore caution has to be taken when adding data to this path to avoid lengthening it unnecessarily. Also, don't assume there's a head node on the list while counting number of nodes. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 502c5c6b645..09cd99e4467 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -95,10 +95,13 @@ static path_list_node_t* add_path_list_node(path_list_node_t *node, REAL x, REAL /* returns element count */ static INT path_list_count(path_list_node_t *node) { - INT count = 1; + INT count = 0; - while((node = node->next)) + while(node) + { ++count; + node = node->next; + } return count; } @@ -2501,7 +2504,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, GpPath *flat_path=NULL; GpStatus status; path_list_node_t *points=NULL, *last_point=NULL; - int i, subpath_start=0, new_length; + int i, subpath_start=0; TRACE("(%p,%p,%s,%0.2f)\n", path, pen, debugstr_matrix(matrix), flatness); @@ -2584,23 +2587,8 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, } } - new_length = path_list_count(points)-1; - - if (!lengthen_path(path, new_length)) + if (!path_list_to_path(points->next, path)) status = OutOfMemory; - } - - if (status == Ok) - { - path->pathdata.Count = new_length; - - last_point = points->next; - for (i = 0; i < new_length; i++) - { - path->pathdata.Points[i] = last_point->pt; - path->pathdata.Types[i] = last_point->type; - last_point = last_point->next; - } path->fill = FillModeWinding; }

1 0

David Kahurani : msvcrt: Free previous environment variable when clearing.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 1580c1133a190f850182ce891f7299a157b1d0fb URL: https://gitlab.winehq.org/wine/wine/-/commit/1580c1133a190f850182ce891f7299… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Fri Jan 26 16:08:33 2024 +0300 msvcrt: Free previous environment variable when clearing. Shifting the rest of the variables by one towards indices of lesser value overwrites the variable being cleared and effectively leaks it. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/msvcrt/environ.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index aa857afa615..a0d2e08c7d0 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -161,6 +161,7 @@ static int env_set(char **env, wchar_t **wenv) *eq = '='; if (!eq[1]) { + free(MSVCRT__environ[idx]); for(; MSVCRT__environ[idx]; idx++) MSVCRT__environ[idx] = MSVCRT__environ[idx + 1]; } @@ -187,6 +188,7 @@ static int env_set(char **env, wchar_t **wenv) *weq = '='; if (!weq[1]) { + free(MSVCRT__wenviron[idx]); for(; MSVCRT__wenviron[idx]; idx++) MSVCRT__wenviron[idx] = MSVCRT__wenviron[idx + 1]; }

1 0

Jacek Caban : ncrypt/tests: Don't use uninitialized variable in test_get_property.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 0db8c0184edd8c4412e484f0e84e08763ecd2321 URL: https://gitlab.winehq.org/wine/wine/-/commit/0db8c0184edd8c4412e484f0e84e08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 29 13:52:05 2024 +0100 ncrypt/tests: Don't use uninitialized variable in test_get_property. --- dlls/ncrypt/tests/ncrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index d2c53c8d1b3..f5dae649a10 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -382,7 +382,7 @@ static void test_get_property(void) ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - ret = NCryptGetProperty(0, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, size, &size, 0); + ret = NCryptGetProperty(0, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), &size, 0); ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0);

1 0

Eric Pouech : dmime/tests: Fix copy & paste errors.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 7aef55a996f086042c346b740d4e752a4b4501a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aef55a996f086042c346b740d4e75… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 22 16:57:42 2024 +0100 dmime/tests: Fix copy & paste errors. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/tests/dmime.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e9036511e9d..e22193e3a5c 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4483,10 +4483,11 @@ static void test_segment_state(void) hr = IDirectMusicSegmentState_GetStartPoint(state, &time); ok(hr == S_OK, "got %#lx\n", hr); ok(time == 0, "got %#lx\n", time); - time = 0xdeadbeef; + value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - ok(time == 0xdeadbeef, "got %#lx\n", time); + todo_wine + ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); ok(hr == S_OK, "got %#lx\n", hr); @@ -4566,10 +4567,11 @@ static void test_segment_state(void) hr = IDirectMusicSegmentState_GetStartPoint(state, &time); ok(hr == S_OK, "got %#lx\n", hr); ok(time == 50, "got %lu\n", time); - time = 0xdeadbeef; + value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - ok(time == 0xdeadbeef, "got %#lx\n", time); + todo_wine + ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); ok(hr == S_OK, "got %#lx\n", hr); @@ -4596,10 +4598,11 @@ static void test_segment_state(void) hr = IDirectMusicSegmentState_GetStartPoint(state, &time); ok(hr == S_OK, "got %#lx\n", hr); ok(time == 50, "got %#lx\n", time); - time = 0xdeadbeef; + value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - ok(time == 0xdeadbeef, "got %#lx\n", time); + todo_wine + ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Eric Pouech : dmime/tests: Add some tests for loops on wave tracks.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: b2441ad69979dda9d8edbeb4a02f2ce8c142207d URL: https://gitlab.winehq.org/wine/wine/-/commit/b2441ad69979dda9d8edbeb4a02f2c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 22 17:02:12 2024 +0100 dmime/tests: Add some tests for loops on wave tracks. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/tests/dmime.c | 89 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e22193e3a5c..f96e6509b7a 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3542,7 +3542,7 @@ static void test_notification_pmsg(void) IDirectMusicTool_Release(tool); } -static void test_wave_pmsg(void) +static void test_wave_pmsg(unsigned num_repeats) { static const DWORD message_types[] = { @@ -3550,17 +3550,25 @@ static void test_wave_pmsg(void) DMUS_PMSGT_WAVE, }; IDirectMusicPerformance *performance; + IDirectMusicSegmentState *state; IDirectMusicSegment *segment; IDirectMusicLoader8 *loader; IDirectMusicGraph *graph; WCHAR test_wav[MAX_PATH]; IDirectMusicTool *tool; DMUS_WAVE_PMSG *wave; + DWORD mt_start_ref; MUSIC_TIME length; DMUS_PMSG *msg; + DWORD value; HRESULT hr; + unsigned i; DWORD ret; + if (num_repeats) + winetest_push_context("with %u repeats", num_repeats); + else + winetest_push_context("without any repeats"); hr = test_tool_create(message_types, ARRAY_SIZE(message_types), &tool); ok(hr == S_OK, "got %#lx\n", hr); @@ -3599,6 +3607,12 @@ static void test_wave_pmsg(void) ok(length == 1, "got %lu\n", length); + if (num_repeats) + { + hr = IDirectMusicSegment_SetRepeats(segment, num_repeats); + ok(hr == S_OK, "got %#lx\n", hr); + } + /* without Download, no DMUS_PMSGT_WAVE is sent */ hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); @@ -3611,10 +3625,14 @@ static void test_wave_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); + todo_wine_if(num_repeats) ok(!ret, "got %#lx\n", ret); - ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); - hr = IDirectMusicPerformance_FreePMsg(performance, msg); - ok(hr == S_OK, "got %#lx\n", hr); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } ret = test_tool_wait_message(tool, 100, &msg); ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); @@ -3626,7 +3644,7 @@ static void test_wave_pmsg(void) hr = IDirectMusicSegment8_Download((IDirectMusicSegment8 *)segment, (IUnknown *)performance); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, &state); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); @@ -3635,24 +3653,54 @@ static void test_wave_pmsg(void) hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); - ok(!ret, "got %#lx\n", ret); - ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); - ok(!!wave->punkUser, "got %p\n", wave->punkUser); - ok(wave->rtStartOffset == 0, "got %I64d\n", wave->rtStartOffset); - ok(wave->rtDuration == 1000000, "got %I64d\n", wave->rtDuration); - ok(wave->lOffset == 0, "got %lu\n", wave->lOffset); - ok(wave->lVolume == 0, "got %lu\n", wave->lVolume); - ok(wave->lPitch == 0, "got %lu\n", wave->lPitch); - ok(wave->bFlags == 0, "got %#x\n", wave->bFlags); - hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)wave); + hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, 1000000, &length); ok(hr == S_OK, "got %#lx\n", hr); + /* assuming not modified tempo */ + length = round((1000000 * 120.0 * DMUS_PPQ) / 600000000.0); + + for (i = 0; i <= num_repeats; i++) + { + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); + todo_wine_if(num_repeats && ret) + ok(!ret, "got %#lx\n", ret); + if (ret) continue; + ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); + ok(wave->dwSize == sizeof(*wave), "got %lu\n", wave->dwSize); + ok(!!wave->punkUser, "got %p\n", wave->punkUser); + ok((wave->dwFlags & DMUS_PMSGF_REFTIME) && (wave->dwFlags & DMUS_PMSGF_MUSICTIME), + "got %lx\n", wave->dwFlags); + if (i == 0) + mt_start_ref = wave->mtTime; + else + todo_wine + ok(wave->mtTime == mt_start_ref + length * i, "got %lu (%lu,%lu)\n", wave->mtTime, mt_start_ref, i * length); + ok(wave->rtStartOffset == 0, "got %I64d\n", wave->rtStartOffset); + ok(wave->rtDuration == 1000000, "got %I64d\n", wave->rtDuration); + ok(wave->lOffset == 0, "got %lu\n", wave->lOffset); + ok(wave->lVolume == 0, "got %lu\n", wave->lVolume); + ok(wave->lPitch == 0, "got %lu\n", wave->lPitch); + ok(wave->bFlags == 0, "got %#x\n", wave->bFlags); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)wave); + ok(hr == S_OK, "got %#lx\n", hr); + } ret = test_tool_wait_message(tool, 500, &msg); + todo_wine_if(num_repeats) ok(!ret, "got %#lx\n", ret); - ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); - hr = IDirectMusicPerformance_FreePMsg(performance, msg); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + hr = IDirectMusicSegment_GetRepeats(segment, &value); ok(hr == S_OK, "got %#lx\n", hr); + ok(value == num_repeats, "got %lu\n", value); + + hr = IDirectMusicSegmentState_GetRepeats(state, &value); + ok(hr == S_OK, "got %#lx\n", hr); + ok(value == num_repeats, "got %lu\n", value); hr = IDirectMusicSegment8_Unload((IDirectMusicSegment8 *)segment, (IUnknown *)performance); ok(hr == S_OK, "got %#lx\n", hr); @@ -3670,6 +3718,8 @@ static void test_wave_pmsg(void) IDirectMusicPerformance_Release(performance); IDirectMusicTool_Release(tool); + + winetest_pop_context(); } static void test_sequence_track(void) @@ -4664,7 +4714,8 @@ START_TEST(dmime) test_performance_time(); test_performance_pmsg(); test_notification_pmsg(); - test_wave_pmsg(); + test_wave_pmsg(0); + test_wave_pmsg(10); test_sequence_track(); test_band_track_play(); test_tempo_track_play();

1 0

Eric Pouech : dmime: Fix IDirectMusicAudioPath::GetObjectInPath() prototype.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 1bdf94a409e1862206a27ee77e16b182b6f716de URL: https://gitlab.winehq.org/wine/wine/-/commit/1bdf94a409e1862206a27ee77e16b1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jan 26 17:20:32 2024 +0100 dmime: Fix IDirectMusicAudioPath::GetObjectInPath() prototype. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/audiopath.c | 4 ++-- include/dmusici.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 2e6a916136f..3389f965b8f 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -140,12 +140,12 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if } static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAudioPath *iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, - REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void** ppObject) + REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); HRESULT hr; - FIXME("(%p, %ld, %ld, %ld, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), + FIXME("(%p, %ld, %ld, %ld, %s, %ld, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); switch (dwStage) { diff --git a/include/dmusici.h b/include/dmusici.h index 80e89a37d0e..bae6d2ae139 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -1177,7 +1177,7 @@ DECLARE_INTERFACE_(IDirectMusicAudioPath,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectMusicAudioPath methods ***/ - STDMETHOD(GetObjectInPath)(THIS_ DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void **ppObject) PURE; + STDMETHOD(GetObjectInPath)(THIS_ DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void **ppObject) PURE; STDMETHOD(Activate)(THIS_ BOOL fActivate) PURE; STDMETHOD(SetVolume)(THIS_ LONG lVolume, DWORD dwDuration) PURE; STDMETHOD(ConvertPChannel)(THIS_ DWORD dwPChannelIn, DWORD *pdwPChannelOut) PURE;

1 0

Eric Pouech : dmime: Remove unused fields in segment.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 7d1cfb9e013d1821a62989916cd9bf8fa2669656 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d1cfb9e013d1821a62989916cd9bf… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jan 26 17:22:58 2024 +0100 dmime: Remove unused fields in segment. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/segment.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 75e8d706ed4..b208f89148c 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -49,10 +49,6 @@ struct segment DMUS_IO_SEGMENT_HEADER header; IDirectMusicGraph *pGraph; struct list tracks; - - PCMWAVEFORMAT wave_format; - void *wave_data; - int data_size; }; static struct segment *segment_create(void); @@ -112,7 +108,6 @@ static ULONG WINAPI segment_Release(IDirectMusicSegment8 *iface) list_remove(&entry->entry); track_entry_destroy(entry); } - free(This->wave_data); free(This); }

1 0

Eric Pouech : dmime/tests: Add some tests about end-points.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 8169c4d040e8301e6401a03729443e3b1f635398 URL: https://gitlab.winehq.org/wine/wine/-/commit/8169c4d040e8301e6401a03729443e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 22 17:40:19 2024 +0100 dmime/tests: Add some tests about end-points. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f96e6509b7a..26fdf3ef2a5 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4512,6 +4512,10 @@ static void test_segment_state(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicSegment_SetRepeats(segment, 0); ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicSegment_SetLoopPoints(segment, 10, 70); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicSegment_SetLoopPoints(segment, 10, 101); + ok(hr == DMUS_E_OUT_OF_RANGE, "got %#lx\n", hr); hr = IDirectMusicSegment_SetLoopPoints(segment, 0, 0); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Alexandros Frantzis : winewayland.drv: Track and apply latest window cursor on pointer enter.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: fe1f3e277d25b299c8c526c3d706a38fbde24e11 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe1f3e277d25b299c8c526c3d706a3… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Jan 26 09:45:14 2024 +0200 winewayland.drv: Track and apply latest window cursor on pointer enter. Keep track of the window cursor set for each surface and apply it when the pointer enters the corresponding surface. This fixes a problem where due to transient disagreements between win32 pointer focus and Wayland pointer focus a cursor update may be lost. For example: 1. Assume existing cursor C1. 2. Window is created beneath cursor. 3. The SetCursor(hwnd, C2) driver callback is called, but because the wl_pointer hasn't entered the Wayland surface yet we don't update the wl_pointer cursor. 4. wl_pointer enters the surface, we apply the latest cursor we know about, which is C1. 5. Since no change in cursor window occurs, we don't get any further SetCursor(hwnd, C2) callbacks, so we get stuck with C1. This commit fixes the problem by tracking the per-surface HCURSOR in step 3, regardless of whether the cursor is actually applied. So, in step 4 we can use that HCURSOR for the surface. This change also fixes some cases of our mouselook heuristics not kicking in properly due to missing a SetCursor(hwnd, NULL) in the manner described above. --- dlls/winewayland.drv/wayland_pointer.c | 3 +++ dlls/winewayland.drv/waylanddrv.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index fad75c8506c..54dd7931b6e 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -670,6 +670,9 @@ static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor) if ((surface = wayland_surface_lock_hwnd(hwnd))) { scale = surface->window.scale; + if (use_hcursor) surface->hcursor = hcursor; + else hcursor = surface->hcursor; + use_hcursor = TRUE; pthread_mutex_unlock(&surface->mutex); } else diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 0883c43f1ff..f030f6fc6a0 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -201,6 +201,7 @@ struct wayland_surface struct wayland_window_config window; struct wayland_client_surface *client; int buffer_width, buffer_height; + HCURSOR hcursor; }; struct wayland_shm_buffer

1 0

Alex Henrie : krnl386: Emulate the VGA status register.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: b87bd5e9b0f9536e78254c877bd333d46d151509 URL: https://gitlab.winehq.org/wine/wine/-/commit/b87bd5e9b0f9536e78254c877bd333… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 28 00:16:14 2024 -0700 krnl386: Emulate the VGA status register. Sega Bug uses it as a timer. --- dlls/krnl386.exe16/ioports.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c index 7f795c2badf..dc188fabecf 100644 --- a/dlls/krnl386.exe16/ioports.c +++ b/dlls/krnl386.exe16/ioports.c @@ -316,6 +316,9 @@ DWORD DOSVM_inport( int port, int size ) case 0x201: res = ~0U; /* no joystick */ break; + case 0x3da: + res = GetTickCount() % 17 == 0 ? 0x4 : 0; /* report vblank about 60 times per second */ + break; default: WARN("Direct I/O read attempted from port %x\n", port); break;

1 0