April 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Move ShowOwnedPopups implementation from user32.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: bed878dd2b88cff039b5659739e801606ee7df4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed878dd2b88cff039b56597… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:54:04 2022 +0200 win32u: Move ShowOwnedPopups implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 33 ++------------------------------- dlls/win32u/window.c | 39 +++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d44f058d256..8640ad5a473 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1283,38 +1283,9 @@ HWND WINAPI GetWindow( HWND hwnd, UINT rel ) /******************************************************************* * ShowOwnedPopups (USER32.@) */ -BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL fShow ) +BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL show ) { - int count = 0; - HWND *win_array = WIN_ListChildren( GetDesktopWindow() ); - - if (!win_array) return TRUE; - - while (win_array[count]) count++; - while (--count >= 0) - { - if (GetWindow( win_array[count], GW_OWNER ) != owner) continue; - if (fShow) - { - if (win_get_flags( win_array[count] ) & WIN_NEEDS_SHOW_OWNEDPOPUP) - /* In Windows, ShowOwnedPopups(TRUE) generates - * WM_SHOWWINDOW messages with SW_PARENTOPENING, - * regardless of the state of the owner - */ - SendMessageW(win_array[count], WM_SHOWWINDOW, SW_SHOWNORMAL, SW_PARENTOPENING); - } - else - { - if (GetWindowLongW( win_array[count], GWL_STYLE ) & WS_VISIBLE) - /* In Windows, ShowOwnedPopups(FALSE) generates - * WM_SHOWWINDOW messages with SW_PARENTCLOSING, - * regardless of the state of the owner - */ - SendMessageW(win_array[count], WM_SHOWWINDOW, SW_HIDE, SW_PARENTCLOSING); - } - } - HeapFree( GetProcessHeap(), 0, win_array ); - return TRUE; + return NtUserShowOwnedPopups( owner, show ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 9e3b085ac32..49813aa2ad3 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4237,6 +4237,42 @@ BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ) return send_message( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } +/* see ShowOwnedPopups */ +static BOOL show_owned_popups( HWND owner, BOOL show ) +{ + int count = 0; + HWND *win_array = list_window_children( 0, get_desktop_window(), NULL, 0 ); + + if (!win_array) return TRUE; + + while (win_array[count]) count++; + while (--count >= 0) + { + if (get_window_relative( win_array[count], GW_OWNER ) != owner) continue; + if (show) + { + if (win_get_flags( win_array[count] ) & WIN_NEEDS_SHOW_OWNEDPOPUP) + /* In Windows, ShowOwnedPopups(TRUE) generates + * WM_SHOWWINDOW messages with SW_PARENTOPENING, + * regardless of the state of the owner + */ + send_message( win_array[count], WM_SHOWWINDOW, SW_SHOWNORMAL, SW_PARENTOPENING ); + } + else + { + if (get_window_long( win_array[count], GWL_STYLE ) & WS_VISIBLE) + /* In Windows, ShowOwnedPopups(FALSE) generates + * WM_SHOWWINDOW messages with SW_PARENTCLOSING, + * regardless of the state of the owner + */ + send_message( win_array[count], WM_SHOWWINDOW, SW_HIDE, SW_PARENTCLOSING ); + } + } + + free( win_array ); + return TRUE; +} + /******************************************************************* * NtUserFlashWindowEx (win32u.@) */ @@ -5198,6 +5234,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_SetWindowPixelFormat: return set_window_pixel_format( hwnd, param ); + case NtUserCallHwndParam_ShowOwnedPopups: + return show_owned_popups( hwnd, param ); + /* temporary exports */ case NtUserIsWindowDrawable: return is_window_drawable( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index 79ea57590bf..61ee94f7a5c 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -875,6 +875,7 @@ enum NtUserCallHwndParam_ScreenToClient, NtUserCallHwndParam_SetForegroundWindow, NtUserCallHwndParam_SetWindowPixelFormat, + NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ NtUserIsWindowDrawable, NtUserSetCaptureWindow, @@ -1034,4 +1035,9 @@ static inline BOOL NtUserSetWindowPixelFormat( HWND hwnd, int format ) return NtUserCallHwndParam( hwnd, format, NtUserCallHwndParam_SetWindowPixelFormat ); } +static inline BOOL NtUserShowOwnedPopups( HWND hwnd, BOOL show ) +{ + return NtUserCallHwndParam( hwnd, show, NtUserCallHwndParam_ShowOwnedPopups ); +} + #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Move more WM_SYSCOMMAND handling from user32.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 35ac1b3f0700b3f6c1b8a9bbb87e9aad37ce3cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ac1b3f0700b3f6c1b8a9bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:54:16 2022 +0200 win32u: Move more WM_SYSCOMMAND handling from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 17 ----------------- dlls/win32u/defwnd.c | 22 +++++++++++++++++++++- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index dbcb09875d0..a2b5a82a5e6 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1550,23 +1550,6 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) WINPOS_SysCommandSizeMove( hwnd, wParam ); break; - case SC_MINIMIZE: - ShowOwnedPopups(hwnd,FALSE); - NtUserShowWindow( hwnd, SW_MINIMIZE ); - break; - - case SC_MAXIMIZE: - if (IsIconic(hwnd)) - ShowOwnedPopups(hwnd,TRUE); - NtUserShowWindow( hwnd, SW_MAXIMIZE ); - break; - - case SC_RESTORE: - if (IsIconic(hwnd)) - ShowOwnedPopups(hwnd,TRUE); - NtUserShowWindow( hwnd, SW_RESTORE ); - break; - case SC_CLOSE: return SendMessageW( hwnd, WM_CLOSE, 0, 0 ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 22d2b08951d..0080d4f7cc6 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -131,7 +131,27 @@ static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam ) if (!user_driver->pSysCommand( hwnd, wparam, lparam )) return 0; - return 1; + switch (wparam & 0xfff0) + { + case SC_MINIMIZE: + show_owned_popups( hwnd, FALSE ); + NtUserShowWindow( hwnd, SW_MINIMIZE ); + break; + + case SC_MAXIMIZE: + if (is_iconic(hwnd)) show_owned_popups( hwnd, TRUE ); + NtUserShowWindow( hwnd, SW_MAXIMIZE ); + break; + + case SC_RESTORE: + if (is_iconic( hwnd )) show_owned_popups( hwnd, TRUE ); + NtUserShowWindow( hwnd, SW_RESTORE ); + break; + + default: + return 1; /* handle on client side */ + } + return 0; } LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ceff548526b..651003d4e84 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -431,6 +431,7 @@ extern LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newv BOOL ansi ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ) DECLSPEC_HIDDEN; extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; +extern BOOL show_owned_popups( HWND owner, BOOL show ) DECLSPEC_HIDDEN; extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 49813aa2ad3..ba58dbf96aa 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4238,7 +4238,7 @@ BOOL WINAPI NtUserShowWindow( HWND hwnd, INT cmd ) } /* see ShowOwnedPopups */ -static BOOL show_owned_popups( HWND owner, BOOL show ) +BOOL show_owned_popups( HWND owner, BOOL show ) { int count = 0; HWND *win_array = list_window_children( 0, get_desktop_window(), NULL, 0 );

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: fa7c22e4583be847c0a830c87de2a6c7636adbce URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa7c22e4583be847c0a830c8… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Apr 15 18:13:40 2022 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/nl.po b/po/nl.po index 659afc3bf40..8318d5fc54c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-03-23 17:00+0100\n" +"PO-Revision-Date: 2022-04-15 18:10+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -4006,10 +4006,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' is geen Map object" +msgstr "'this' is geen | object" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value"

1 0

Nikolay Sivov : ddraw: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 4ceb3a650d1557451cb13da2625c75dc7ffb70fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ceb3a650d1557451cb13da2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 14 16:27:40 2022 +0300 ddraw: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/clipper.c | 12 +- dlls/ddraw/ddraw.c | 170 ++++++++++++------------ dlls/ddraw/device.c | 198 ++++++++++++++-------------- dlls/ddraw/executebuffer.c | 42 +++--- dlls/ddraw/light.c | 4 +- dlls/ddraw/main.c | 34 ++--- dlls/ddraw/material.c | 8 +- dlls/ddraw/palette.c | 14 +- dlls/ddraw/surface.c | 313 ++++++++++++++++++++++----------------------- dlls/ddraw/utils.c | 40 +++--- dlls/ddraw/vertexbuffer.c | 26 ++-- dlls/ddraw/viewport.c | 43 +++---- 13 files changed, 451 insertions(+), 454 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ceb3a650d1557451cb1…

1 0

Gabriel Ivăncescu : jscript: Initialize hres in String constructor.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: e254680ed15f43409114881d8ed613aa4b0de944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e254680ed15f43409114881d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 15 16:00:21 2022 +0300 jscript: Initialize hres in String constructor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e73b9e8b52f..dac89c9d8a9 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1628,7 +1628,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, jsval_t vthis, WORD static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - HRESULT hres; + HRESULT hres = S_OK; TRACE("\n");

1 0

Ziqing Hui : d2d1: Implement GetUnitMode().
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: eeed1bb541845a5132fa64a37e922be34cdfc177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeed1bb541845a5132fa64a3… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 15 11:31:50 2022 +0800 d2d1: Implement GetUnitMode(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 43c65ebddc1..7bf4d6e1577 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2154,9 +2154,11 @@ static void STDMETHODCALLTYPE d2d_device_context_SetUnitMode(ID2D1DeviceContext static D2D1_UNIT_MODE STDMETHODCALLTYPE d2d_device_context_GetUnitMode(ID2D1DeviceContext *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p.\n", iface); - return D2D1_UNIT_MODE_DIPS; + return context->drawing_state.unitMode; } static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawGlyphRun(ID2D1DeviceContext *iface,

1 0

Ziqing Hui : d2d1: Implement SetUnitMode().
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: c634bd201b5e561c34b86687159e75db5fbc6414 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c634bd201b5e561c34b86687… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 15 11:31:51 2022 +0800 d2d1: Implement SetUnitMode(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 12 +++++++++++- dlls/d2d1/tests/d2d1.c | 5 ++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 7bf4d6e1577..13c99458cfa 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2149,7 +2149,17 @@ static D2D1_PRIMITIVE_BLEND STDMETHODCALLTYPE d2d_device_context_GetPrimitiveBle static void STDMETHODCALLTYPE d2d_device_context_SetUnitMode(ID2D1DeviceContext *iface, D2D1_UNIT_MODE unit_mode) { - FIXME("iface %p, unit_mode %#x stub!\n", iface, unit_mode); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p, unit_mode %#x.\n", iface, unit_mode); + + if (unit_mode != D2D1_UNIT_MODE_DIPS && unit_mode != D2D1_UNIT_MODE_PIXELS) + { + WARN("Unknown unit mode %#x.\n", unit_mode); + return; + } + + context->drawing_state.unitMode = unit_mode; } static D2D1_UNIT_MODE STDMETHODCALLTYPE d2d_device_context_GetUnitMode(ID2D1DeviceContext *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9937d9d4a82..ca80a8e946b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9606,11 +9606,11 @@ static void test_unit_mode(BOOL d3d11) ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); unit_mode = ID2D1DeviceContext_GetUnitMode(context); - todo_wine ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); + ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); ID2D1DeviceContext_SetUnitMode(context, 0xdeadbeef); unit_mode = ID2D1DeviceContext_GetUnitMode(context); - todo_wine ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); + ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); ID2D1DeviceContext_Release(context); release_test_context(&ctx); @@ -10874,7 +10874,6 @@ static void test_image_bounds(BOOL d3d11) ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); - todo_wine_if(!compare_float(test->dpi_x, 96.0f, 0) || !compare_float(test->dpi_y, 96.0f, 0)) ok(compare_rect(&bounds, 0.0f, 0.0f, test->pixel_size.width, test->pixel_size.height, 0), "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", bounds.left, bounds.top, bounds.right, bounds.bottom, 0.0f, 0.0f,

1 0

Huw Davies : wineoss: Move set_event_handle to the unixlib.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 9ced8cc9239dfadfbf4323dcdfcc292f4f5450c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ced8cc9239dfadfbf4323dc… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 07:59:54 2022 +0100 wineoss: Move set_event_handle to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 23 +++++------------------ dlls/wineoss.drv/oss.c | 21 +++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 77548045702..921253b62c2 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -994,7 +994,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct set_event_handle_params params; TRACE("(%p)->(%p)\n", This, event); @@ -1004,24 +1004,11 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - oss_unlock(stream); - return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; - } - - if (stream->event){ - oss_unlock(stream); - FIXME("called twice\n"); - return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - } - - stream->event = event; - - oss_unlock(stream); + params.stream = This->stream; + params.event = event; + OSS_CALL(set_event_handle, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 72e917dfd76..3ea0ab42e3e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1043,6 +1043,26 @@ static NTSTATUS get_current_padding(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_event_handle(void *args) +{ + struct set_event_handle_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED); + + if (stream->event){ + FIXME("called twice\n"); + return oss_unlock_result(stream, &params->result, HRESULT_FROM_WIN32(ERROR_INVALID_NAME)); + } + + stream->event = params->event; + + return oss_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -1058,4 +1078,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + set_event_handle, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index bd4b065c61e..73963b1871b 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -152,6 +152,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct set_event_handle_params +{ + struct oss_stream *stream; + HANDLE event; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, @@ -167,6 +174,7 @@ enum oss_funcs oss_get_buffer_size, oss_get_latency, oss_get_current_padding, + oss_set_event_handle, }; extern unixlib_handle_t oss_handle;

1 0

Huw Davies : wineoss: Move get_render_buffer to the unixlib.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: 7a5a2db11ff7c1c857f07cd4362c4ec25897702b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5a2db11ff7c1c857f07cd4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 07:59:55 2022 +0100 wineoss: Move get_render_buffer to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 55 +++++---------------------------------------- dlls/wineoss.drv/oss.c | 49 ++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++++++ 3 files changed, 64 insertions(+), 49 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 921253b62c2..491e4fc5d16 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1251,9 +1251,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct oss_stream *stream = This->stream; - UINT32 write_pos; - SIZE_T size; + struct get_render_buffer_params params; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1262,53 +1260,12 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, *data = NULL; - oss_lock(stream); - - if(stream->getbuf_last){ - oss_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(!frames){ - oss_unlock(stream); - return S_OK; - } - - if(stream->held_frames + frames > stream->bufsize_frames){ - oss_unlock(stream); - return AUDCLNT_E_BUFFER_TOO_LARGE; - } - - write_pos = - (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; - if(write_pos + frames > stream->bufsize_frames){ - if(stream->tmp_buffer_frames < frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - oss_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = frames; - } - *data = stream->tmp_buffer; - stream->getbuf_last = -frames; - }else{ - *data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; - stream->getbuf_last = frames; - } - - silence_buffer(stream, *data, frames); - - oss_unlock(stream); + params.stream = This->stream; + params.frames = frames; + params.data = data; + OSS_CALL(get_render_buffer, &params); - return S_OK; + return params.result; } static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 written_frames) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 3ea0ab42e3e..9c45aa082b4 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -876,6 +876,54 @@ static NTSTATUS timer_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_render_buffer(void *args) +{ + struct get_render_buffer_params *params = args; + struct oss_stream *stream = params->stream; + UINT32 write_pos, frames = params->frames; + BYTE **data = params->data; + SIZE_T size; + + oss_lock(stream); + + if(stream->getbuf_last) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(!frames) + return oss_unlock_result(stream, &params->result, S_OK); + + if(stream->held_frames + frames > stream->bufsize_frames) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_TOO_LARGE); + + write_pos = + (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; + if(write_pos + frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = frames; + } + *data = stream->tmp_buffer; + stream->getbuf_last = -frames; + }else{ + *data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; + stream->getbuf_last = frames; + } + + silence_buffer(stream, *data, frames); + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1073,6 +1121,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = stop, reset, timer_loop, + get_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 73963b1871b..0d83a03d64f 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -113,6 +113,14 @@ struct timer_loop_params struct oss_stream *stream; }; +struct get_render_buffer_params +{ + struct oss_stream *stream; + UINT32 frames; + HRESULT result; + BYTE **data; +}; + struct is_format_supported_params { const char *device; @@ -169,6 +177,7 @@ enum oss_funcs oss_stop, oss_reset, oss_timer_loop, + oss_get_render_buffer, oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size,

1 0

Huw Davies : wineoss: Move release_render_buffer to the unixlib.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: wine Branch: master Commit: bc839279b820f576d9db460e064c748d7ffef977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc839279b820f576d9db460e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 07:59:56 2022 +0100 wineoss: Move release_render_buffer to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 74 ++++----------------------------------------- dlls/wineoss.drv/oss.c | 59 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++++ 3 files changed, 74 insertions(+), 68 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 491e4fc5d16..d719922c2b7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -919,18 +919,6 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); @@ -1268,70 +1256,20 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return params.result; } -static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 written_frames) -{ - UINT32 write_offs_frames = - (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; - UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; - UINT32 chunk_frames = stream->bufsize_frames - write_offs_frames; - UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; - UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; - - if(written_bytes <= chunk_bytes){ - memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); - }else{ - memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); - memcpy(stream->local_buffer, buffer + chunk_bytes, - written_bytes - chunk_bytes); - } -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct oss_stream *stream = This->stream; - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - oss_lock(stream); - - if(!written_frames){ - stream->getbuf_last = 0; - oss_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - oss_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ - oss_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } - - if(stream->getbuf_last >= 0) - buffer = stream->local_buffer + stream->fmt->nBlockAlign * - ((stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames); - else - buffer = stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(stream, buffer, written_frames); - - if(stream->getbuf_last < 0) - oss_wrap_buffer(stream, buffer, written_frames); - - stream->held_frames += written_frames; - stream->written_frames += written_frames; - stream->getbuf_last = 0; - - oss_unlock(stream); + params.stream = This->stream; + params.written_frames = written_frames; + params.flags = flags; + OSS_CALL(release_render_buffer, &params); - return S_OK; + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9c45aa082b4..4a568f51667 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -924,6 +924,64 @@ static NTSTATUS get_render_buffer(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 written_frames) +{ + UINT32 write_offs_frames = + (stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames; + UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; + UINT32 chunk_frames = stream->bufsize_frames - write_offs_frames; + UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; + + if(written_bytes <= chunk_bytes){ + memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); + }else{ + memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, + written_bytes - chunk_bytes); + } +} + +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct oss_stream *stream = params->stream; + UINT32 written_frames = params->written_frames; + UINT flags = params->flags; + BYTE *buffer; + + oss_lock(stream); + + if(!written_frames){ + stream->getbuf_last = 0; + return oss_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->fmt->nBlockAlign * + ((stream->lcl_offs_frames + stream->held_frames) % stream->bufsize_frames); + else + buffer = stream->tmp_buffer; + + if(flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, written_frames); + + if(stream->getbuf_last < 0) + oss_wrap_buffer(stream, buffer, written_frames); + + stream->held_frames += written_frames; + stream->written_frames += written_frames; + stream->getbuf_last = 0; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1122,6 +1180,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, timer_loop, get_render_buffer, + release_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 0d83a03d64f..e7c3a91691d 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -121,6 +121,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct oss_stream *stream; + UINT32 written_frames; + UINT flags; + HRESULT result; +}; + struct is_format_supported_params { const char *device; @@ -178,6 +186,7 @@ enum oss_funcs oss_reset, oss_timer_loop, oss_get_render_buffer, + oss_release_render_buffer, oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size,

1 0