December 2022 - Wine-Commits

Rémi Bernon : hidclass.sys: Make sure a desktop is created for the driver process.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 5225aabd07010aa9fb11f7c490d63046ff178da5 URL: https://gitlab.winehq.org/wine/wine/-/commit/5225aabd07010aa9fb11f7c490d630… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 hidclass.sys: Make sure a desktop is created for the driver process. This was previously automatically done when user32 was loaded, but since the move of __wine_send_input to win32u, we do not need to load it any more. Make sure we have a desktop or WM_INPUT messages won't be sent by wineserver. --- dlls/hidclass.sys/pnp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 46b6e803465..c0e2a874788 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -599,6 +599,10 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) { minidriver *driver; + /* make sure we have a window station and a desktop, we need one to send input */ + if (!GetProcessWindowStation()) + return STATUS_INVALID_PARAMETER; + if (!(driver = calloc(1, sizeof(*driver)))) return STATUS_NO_MEMORY;

1 0

Rémi Bernon : dinput/tests: Unregister rawinput devices after tests.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 4a5c9f7dc6b4b27cca19b780927e75adfdca0d86 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a5c9f7dc6b4b27cca19b780927e75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 dinput/tests: Unregister rawinput devices after tests. --- dlls/dinput/tests/device8.c | 52 +++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index e779b56092a..b98a24df080 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1103,9 +1103,9 @@ static void test_mouse_keyboard(void) todo_wine ok(hr == 1, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); todo_wine - ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); + ok(raw_devices[0].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[0].usUsagePage); todo_wine - ok(raw_devices[0].usUsage == 6, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].usUsage == HID_USAGE_GENERIC_KEYBOARD, "got usUsage: %x\n", raw_devices[0].usUsage); todo_wine ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); todo_wine @@ -1137,8 +1137,8 @@ static void test_mouse_keyboard(void) memset(raw_devices, 0, sizeof(raw_devices)); hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); ok(hr == 1, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); - ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); - ok(raw_devices[0].usUsage == 2, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[0].usUsagePage); + ok(raw_devices[0].usUsage == HID_USAGE_GENERIC_MOUSE, "got usUsage: %x\n", raw_devices[0].usUsage); ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); todo_wine ok(raw_devices[0].hwndTarget == di_hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); @@ -1152,16 +1152,16 @@ static void test_mouse_keyboard(void) di_hwnd = raw_devices[0].hwndTarget; /* expect dinput8 to take over any activated raw input devices */ - raw_devices[0].usUsagePage = 0x01; - raw_devices[0].usUsage = 0x05; + raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[0].usUsage = HID_USAGE_GENERIC_GAMEPAD; raw_devices[0].dwFlags = 0; raw_devices[0].hwndTarget = hwnd; - raw_devices[1].usUsagePage = 0x01; - raw_devices[1].usUsage = 0x06; + raw_devices[1].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[1].usUsage = HID_USAGE_GENERIC_KEYBOARD; raw_devices[1].dwFlags = 0; raw_devices[1].hwndTarget = hwnd; - raw_devices[2].usUsagePage = 0x01; - raw_devices[2].usUsage = 0x02; + raw_devices[2].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[2].usUsage = HID_USAGE_GENERIC_MOUSE; raw_devices[2].dwFlags = 0; raw_devices[2].hwndTarget = hwnd; raw_devices_count = ARRAY_SIZE(raw_devices); @@ -1176,16 +1176,16 @@ static void test_mouse_keyboard(void) memset(raw_devices, 0, sizeof(raw_devices)); hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); ok(hr == 3, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); - ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); - ok(raw_devices[0].usUsage == 2, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[0].usUsagePage); + ok(raw_devices[0].usUsage == HID_USAGE_GENERIC_MOUSE, "got usUsage: %x\n", raw_devices[0].usUsage); ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); ok(raw_devices[0].hwndTarget == di_hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); - ok(raw_devices[1].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[1].usUsagePage); - ok(raw_devices[1].usUsage == 5, "Unexpected raw device usage: %x\n", raw_devices[1].usUsage); + ok(raw_devices[1].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[1].usUsagePage); + ok(raw_devices[1].usUsage == HID_USAGE_GENERIC_GAMEPAD, "got usUsage: %x\n", raw_devices[1].usUsage); ok(raw_devices[1].dwFlags == 0, "Unexpected raw device flags: %#lx\n", raw_devices[1].dwFlags); ok(raw_devices[1].hwndTarget == hwnd, "Unexpected raw device target: %p\n", raw_devices[1].hwndTarget); - ok(raw_devices[2].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[1].usUsagePage); - ok(raw_devices[2].usUsage == 6, "Unexpected raw device usage: %x\n", raw_devices[1].usUsage); + ok(raw_devices[2].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[1].usUsagePage); + ok(raw_devices[2].usUsage == HID_USAGE_GENERIC_KEYBOARD, "got usUsage: %x\n", raw_devices[1].usUsage); todo_wine ok(raw_devices[2].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %#lx\n", raw_devices[1].dwFlags); todo_wine @@ -1222,11 +1222,27 @@ static void test_mouse_keyboard(void) hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); todo_wine ok(hr == 1, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); - ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); - ok(raw_devices[0].usUsage == 5, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[0].usUsagePage); + ok(raw_devices[0].usUsage == HID_USAGE_GENERIC_GAMEPAD, "got usUsage: %x\n", raw_devices[0].usUsage); ok(raw_devices[0].dwFlags == 0, "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); ok(raw_devices[0].hwndTarget == hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); + raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[0].usUsage = HID_USAGE_GENERIC_GAMEPAD; + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = 0; + raw_devices[1].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[1].usUsage = HID_USAGE_GENERIC_KEYBOARD; + raw_devices[1].dwFlags = RIDEV_REMOVE; + raw_devices[1].hwndTarget = 0; + raw_devices[2].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[2].usUsage = HID_USAGE_GENERIC_MOUSE; + raw_devices[2].dwFlags = RIDEV_REMOVE; + raw_devices[2].hwndTarget = 0; + raw_devices_count = ARRAY_SIZE(raw_devices); + hr = RegisterRawInputDevices(raw_devices, raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(hr == TRUE, "RegisterRawInputDevices failed\n"); + IDirectInputDevice8_Release(di_mouse); IDirectInputDevice8_Release(di_keyboard); IDirectInput8_Release(di);

1 0

Rémi Bernon : dinput/tests: Remove old physical joystick tests.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 8454e2e73065ffb21e34f359403e4fbe3520bb0d URL: https://gitlab.winehq.org/wine/wine/-/commit/8454e2e73065ffb21e34f359403e4f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 dinput/tests: Remove old physical joystick tests. They are now pretty much superseded by the more extensive tests in joystick8.c, using virtual devices. --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/joystick.c | 963 ------------------------------------------ 2 files changed, 964 deletions(-)

1 0

Ryan Hendrickson : wined3d: Recognize AMD as a vendor string.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 07ca9e9a81aa07280bddeb841bc1d56bc04fed25 URL: https://gitlab.winehq.org/wine/wine/-/commit/07ca9e9a81aa07280bddeb841bc1d5… Author: Ryan Hendrickson <ryan.hendrickson(a)alum.mit.edu> Date: Sun Dec 18 17:09:10 2022 -0500 wined3d: Recognize AMD as a vendor string. --- dlls/wined3d/adapter_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f3810bad440..8cd8a883975 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1216,6 +1216,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s if (strstr(gl_vendor_string, "ATI") || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "X.Org R300 Project") + || strstr(gl_vendor_string, "AMD") || strstr(gl_renderer, "AMD") || strstr(gl_renderer, "FirePro") || strstr(gl_renderer, "Radeon")

1 0

Michael Stefaniuc : dmime: Split the segment object creation into a separate helper.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 354ccf3fdb342e45f81b0d8f0ba9816e6932613b URL: https://gitlab.winehq.org/wine/wine/-/commit/354ccf3fdb342e45f81b0d8f0ba981… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 17 23:00:33 2022 +0100 dmime: Split the segment object creation into a separate helper. --- dlls/dmime/segment.c | 52 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b1dd21c1242..b7d7f2142b8 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -826,28 +826,38 @@ static const IPersistStreamVtbl persiststream_vtbl = { unimpl_IPersistStream_GetSizeMax }; +IDirectMusicSegment8Impl *create_segment(void) +{ + IDirectMusicSegment8Impl *obj; + + if (!(obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)))) + return NULL; + + obj->IDirectMusicSegment8_iface.lpVtbl = &dmsegment8_vtbl; + obj->ref = 1; + dmobject_init(&obj->dmobj, &CLSID_DirectMusicSegment, (IUnknown *)&obj->IDirectMusicSegment8_iface); + obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; + obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init (&obj->Tracks); + + DMIME_LockModule(); + + return obj; +} + /* for ClassFactory */ -HRESULT create_dmsegment(REFIID lpcGUID, void **ppobj) +HRESULT create_dmsegment(REFIID guid, void **ret_iface) { - IDirectMusicSegment8Impl* obj; - HRESULT hr; + IDirectMusicSegment8Impl *obj; + HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegment8Impl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicSegment8_iface.lpVtbl = &dmsegment8_vtbl; - obj->ref = 1; - dmobject_init(&obj->dmobj, &CLSID_DirectMusicSegment, - (IUnknown *)&obj->IDirectMusicSegment8_iface); - obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; - obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - list_init (&obj->Tracks); - - DMIME_LockModule(); - hr = IDirectMusicSegment8_QueryInterface(&obj->IDirectMusicSegment8_iface, lpcGUID, ppobj); - IDirectMusicSegment8_Release(&obj->IDirectMusicSegment8_iface); - - return hr; + if (!(obj = create_segment())) { + *ret_iface = NULL; + return E_OUTOFMEMORY; + } + + hr = IDirectMusicSegment8_QueryInterface(&obj->IDirectMusicSegment8_iface, guid, ret_iface); + IDirectMusicSegment8_Release(&obj->IDirectMusicSegment8_iface); + + return hr; }

1 0

Michael Stefaniuc : dmime: Implement the IDirectMusicSegment8_Clone() method.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: c92d01016b2034f3b173a5186cfa42f6bab87f72 URL: https://gitlab.winehq.org/wine/wine/-/commit/c92d01016b2034f3b173a5186cfa42… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 17 23:01:38 2022 +0100 dmime: Implement the IDirectMusicSegment8_Clone() method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941 --- dlls/dmime/segment.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b7d7f2142b8..bf44c5e73b3 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -35,6 +35,8 @@ typedef struct IDirectMusicSegment8Impl { struct list Tracks; } IDirectMusicSegment8Impl; +IDirectMusicSegment8Impl *create_segment(void); + static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMusicSegment8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface); @@ -410,12 +412,50 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if return S_OK; } -static HRESULT WINAPI IDirectMusicSegment8Impl_Clone(IDirectMusicSegment8 *iface, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicSegment **ppSegment) +static HRESULT WINAPI IDirectMusicSegment8Impl_Clone(IDirectMusicSegment8 *iface, MUSIC_TIME start, MUSIC_TIME end, + IDirectMusicSegment **segment) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppSegment); - return S_OK; + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + IDirectMusicSegment8Impl *clone; + IDirectMusicTrack *track; + DMUS_PRIVATE_SEGMENT_TRACK *track_item, *cloned_item; + HRESULT hr; + BOOL track_clone_fail = FALSE; + + TRACE("(%p, %ld, %ld, %p)\n", This, start, end, segment); + + if (!segment) + return E_POINTER; + + if (!(clone = create_segment())) { + *segment = NULL; + return E_OUTOFMEMORY; + } + + clone->header = This->header; + clone->pGraph = This->pGraph; + if (clone->pGraph) + IDirectMusicGraph_AddRef(clone->pGraph); + + LIST_FOR_EACH_ENTRY(track_item, &This->Tracks, DMUS_PRIVATE_SEGMENT_TRACK, entry) { + if (SUCCEEDED(hr = IDirectMusicTrack_Clone(track_item->pTrack, start, end, &track))) { + if ((cloned_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*cloned_item)))) { + cloned_item->dwGroupBits = track_item->dwGroupBits; + cloned_item->flags = track_item->flags; + cloned_item->pTrack = track; + list_add_tail(&clone->Tracks, &cloned_item->entry); + continue; + } else { + IDirectMusicTrack_Release(track); + } + } + WARN("Failed to clone track %p: %#lx\n", track_item->pTrack, hr); + track_clone_fail = TRUE; + } + + *segment = (IDirectMusicSegment *)&clone->IDirectMusicSegment8_iface; + + return track_clone_fail ? S_FALSE : S_OK; } static HRESULT WINAPI IDirectMusicSegment8Impl_SetStartPoint(IDirectMusicSegment8 *iface,

1 0

Michael Stefaniuc : dmcompos: Return a valid pointer from ComposeSegmentFromTemplate().
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 3f0afe8e5ca286b6b26e7a20b16e47f8a99a2a96 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f0afe8e5ca286b6b26e7a20b16e47… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 17 23:38:41 2022 +0100 dmcompos: Return a valid pointer from ComposeSegmentFromTemplate(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941 --- dlls/dmcompos/composer.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index a13a77bff94..a2a58396ee5 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -77,12 +77,38 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface /* IDirectMusicComposerImpl IDirectMusicComposer part: */ static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate(IDirectMusicComposer *iface, - IDirectMusicStyle *pStyle, IDirectMusicSegment *pTemplate, WORD wActivity, - IDirectMusicChordMap *pChordMap, IDirectMusicSegment **ppSegment) + IDirectMusicStyle *style, IDirectMusicSegment *template, WORD activity, IDirectMusicChordMap *chordmap, + IDirectMusicSegment **segment) { - IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); - FIXME("(%p, %p, %p, %d, %p, %p): stub\n", This, pStyle, pTemplate, wActivity, pChordMap, ppSegment); - return S_OK; + IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); + IDirectMusicTrack *track; + HRESULT hr; + + FIXME("(%p, %p, %p, %d, %p, %p): semi-stub\n", This, style, template, activity, chordmap, segment); + + if (!segment) + return E_POINTER; + if (!template) + return E_INVALIDARG; + + if (!style) { + hr = IDirectMusicSegment_GetTrack(template, &CLSID_DirectMusicStyleTrack, 0xFFFFFFFF, + DMUS_SEG_ANYTRACK, &track); + if (FAILED(hr)) + return E_INVALIDARG; + else + IDirectMusicTrack_Release(track); /* Temp to not leak memory */ + } + if (!chordmap) { + hr = IDirectMusicSegment_GetTrack(template, &CLSID_DirectMusicChordMapTrack, 0xFFFFFFFF, + DMUS_SEG_ANYTRACK, &track); + if (FAILED(hr)) + return E_INVALIDARG; + else + IDirectMusicTrack_Release(track); /* Temp to not leak memory */ + } + + return IDirectMusicSegment_Clone(template, -1, 0, segment); } static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromShape(IDirectMusicComposer *iface,

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 2b1cfcd011b0c4b068903e0aff3d40114c7da7c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b1cfcd011b0c4b068903e0aff3d40… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 18 19:29:41 2022 +0900 po: Update Japanese translation. --- po/ja.po | 260 +++++++++++++++++++++------------------------------------------ 1 file changed, 86 insertions(+), 174 deletions(-)

1 0

Gerald Pfeifer : libwine: Only define exe_link when needed.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 208b824ecd24a22c0dd0cb9cbeaaefda3d78e4cd URL: https://gitlab.winehq.org/wine/wine/-/commit/208b824ecd24a22c0dd0cb9cbeaaef… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 17 02:21:13 2022 +0100 libwine: Only define exe_link when needed. 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. (This avoids a compiler warning with GCC 12.) --- 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 4eb446258cc..34ede6ed0a6 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 +#elif ! defined (__FreeBSD__) && ! defined(__DragonFly__) static const char exe_link[] = ""; #endif

1 0

Gerald Pfeifer : winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 443805b10a7b774767a564320c222aa9d183458d URL: https://gitlab.winehq.org/wine/wine/-/commit/443805b10a7b774767a564320c222a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 17 00:31:54 2022 +0100 winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H. find_device_from_devnode was unnecessarily guarded by HAVE_SYS_INOTIFY_H, alas its use in process_monitor_event was not, so linking failed. Simply make find_device_from_devnode generally available. --- dlls/winebus.sys/bus_udev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 71b9ef84530..3cd8bfd1ceb 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -260,6 +260,16 @@ static struct base_device *find_device_from_fd(int fd) return NULL; } +static struct base_device *find_device_from_devnode(const char *path) +{ + struct base_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) + if (!strcmp(impl->devnode, path)) return impl; + + return NULL; +} + static void hidraw_device_destroy(struct unix_device *iface) { struct hidraw_device *impl = hidraw_impl_from_unix_device(iface); @@ -1546,16 +1556,6 @@ static int create_inotify(void) return fd; } -static struct base_device *find_device_from_devnode(const char *path) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (!strcmp(impl->devnode, path)) return impl; - - return NULL; -} - static void maybe_remove_devnode(const char *base, const char *dir) { struct base_device *impl;

1 0