May 2022 - Wine-Commits - list.winehq.org

Jacek Caban : winex11: Use import_text_uri_list code in EVENT_DropURLs.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 30e172203dfaa44393fdcc362fdc4da6db40ae18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e172203dfaa44393fdcc36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 21:48:41 2022 +0200 winex11: Use import_text_uri_list code in EVENT_DropURLs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 17 +++++-- dlls/winex11.drv/event.c | 118 +++++++++++++++---------------------------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 54 insertions(+), 82 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 506d1a81f0f..f2f93c9ee38 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1043,11 +1043,9 @@ static void *import_text_html( Atom type, const void *data, size_t size, size_t /************************************************************************** - * import_text_uri_list - * - * Import text/uri-list. + * uri_list_to_drop_files */ -static void *import_text_uri_list( Atom type, const void *data, size_t size, size_t *ret_size ) +void *uri_list_to_drop_files( const void *data, size_t size, size_t *ret_size ) { const char *uriList = data; char *uri; @@ -1121,6 +1119,17 @@ static void *import_text_uri_list( Atom type, const void *data, size_t size, siz } +/************************************************************************** + * import_text_uri_list + * + * Import text/uri-list. + */ +static void *import_text_uri_list( Atom type, const void *data, size_t size, size_t *ret_size ) +{ + return uri_list_to_drop_files( data, size, ret_size ); +} + + /************************************************************************** * import_targets * diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5a22464d594..cb0e91821e4 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1476,6 +1476,20 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) return hQueryWnd; } +static void post_drop( HWND hwnd, DROPFILES *drop, ULONG size ) +{ + HDROP handle; + + if ((handle = GlobalAlloc( GMEM_SHARE, size ))) + { + DROPFILES *ptr = GlobalLock( handle ); + memcpy( ptr, drop, size ); + ptr->fWide = TRUE; + GlobalUnlock( handle ); + PostMessageW( hwnd, WM_DROPFILES, (WPARAM)handle, 0 ); + } +} + /********************************************************************** * EVENT_DropFromOffix * @@ -1573,14 +1587,11 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) { struct x11drv_win_data *win_data; unsigned long data_length; - unsigned long aux_long, drop_len = 0; + unsigned long aux_long; unsigned char *p_data = NULL; /* property data */ - char *p_drop = NULL; - char *p, *next; int x, y; - POINT pos; - DROPFILES *lpDrop; - HDROP hDrop; + DROPFILES *drop; + int format; union { Atom atom_aux; int i; @@ -1592,87 +1603,38 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) XGetWindowProperty( event->display, DefaultRootWindow(event->display), x11drv_atom(DndSelection), 0, 65535, FALSE, - AnyPropertyType, &u.atom_aux, &u.i, + AnyPropertyType, &u.atom_aux, &format, &data_length, &aux_long, &p_data); if (aux_long) WARN("property too large, truncated!\n"); TRACE("urls=%s\n", p_data); - if( !aux_long && p_data) { /* don't bother if > 64K */ - /* calculate length */ - p = (char*) p_data; - next = strchr(p, '\n'); - while (p) { - if (next) *next=0; - if (strncmp(p,"file:",5) == 0 ) { - INT len = GetShortPathNameA( p+5, NULL, 0 ); - if (len) drop_len += len + 1; - } - if (next) { - *next = '\n'; - p = next + 1; - next = strchr(p, '\n'); - } else { - p = NULL; - } - } - - if( drop_len && drop_len < 65535 ) { - XQueryPointer( event->display, root_window, &u.w_aux, &u.w_aux, - &x, &y, &u.i, &u.i, &u.u); - pos = root_to_virtual_screen( x, y ); - - drop_len += sizeof(DROPFILES) + 1; - hDrop = GlobalAlloc( GMEM_SHARE, drop_len ); - lpDrop = GlobalLock( hDrop ); + if (!aux_long && p_data) /* don't bother if > 64K */ + { + size_t drop_size; + drop = uri_list_to_drop_files( p_data, get_property_size( format, data_length ), &drop_size ); - if( lpDrop && (win_data = get_win_data( hWnd ))) + if (drop) { - lpDrop->pFiles = sizeof(DROPFILES); - lpDrop->pt = pos; - lpDrop->fNC = - (pos.x < (win_data->client_rect.left - win_data->whole_rect.left) || - pos.y < (win_data->client_rect.top - win_data->whole_rect.top) || - pos.x > (win_data->client_rect.right - win_data->whole_rect.left) || - pos.y > (win_data->client_rect.bottom - win_data->whole_rect.top) ); - lpDrop->fWide = FALSE; - p_drop = (char*)(lpDrop + 1); - release_win_data( win_data ); + XQueryPointer( event->display, root_window, &u.w_aux, &u.w_aux, + &x, &y, &u.i, &u.i, &u.u); + drop->pt = root_to_virtual_screen( x, y ); + + if ((win_data = get_win_data( hWnd ))) + { + drop->fNC = + (drop->pt.x < (win_data->client_rect.left - win_data->whole_rect.left) || + drop->pt.y < (win_data->client_rect.top - win_data->whole_rect.top) || + drop->pt.x > (win_data->client_rect.right - win_data->whole_rect.left) || + drop->pt.y > (win_data->client_rect.bottom - win_data->whole_rect.top) ); + release_win_data( win_data ); + } + + post_drop( hWnd, drop, drop_size ); + free( drop ); } - - /* create message content */ - if (p_drop) { - p = (char*) p_data; - next = strchr(p, '\n'); - while (p) { - if (next) *next=0; - if (strncmp(p,"file:",5) == 0 ) { - INT len = GetShortPathNameA( p+5, p_drop, 65535 ); - if (len) { - TRACE("drop file %s as %s\n", p+5, p_drop); - p_drop += len+1; - } else { - WARN("can't convert file %s to dos name\n", p+5); - } - } else { - WARN("unknown mime type %s\n", p); - } - if (next) { - *next = '\n'; - p = next + 1; - next = strchr(p, '\n'); - } else { - p = NULL; - } - *p_drop = '\0'; - } - - GlobalUnlock(hDrop); - PostMessageA( hWnd, WM_DROPFILES, (WPARAM)hDrop, 0L ); - } - } } - if( p_data ) XFree(p_data); + if (p_data) XFree( p_data ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2ff6bb00eb6..6b224f5426a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -661,6 +661,7 @@ extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; extern void init_win_context(void) DECLSPEC_HIDDEN; +extern void *uri_list_to_drop_files( const void *data, size_t size, size_t *ret_size ) DECLSPEC_HIDDEN; static inline void mirror_rect( const RECT *window_rect, RECT *rect ) {

1 0

Jacek Caban : win32u: Use NT interface for MsgWaitForMultipleObjectsEx user driver entry point.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: ac9b63580018354c5a7c9164bb5c781b9e2b6cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac9b63580018354c5a7c9164… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 13:23:42 2022 +0200 win32u: Use NT interface for MsgWaitForMultipleObjectsEx user driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dce.c | 3 ++- dlls/win32u/driver.c | 28 ++++++---------------------- dlls/win32u/input.c | 3 ++- dlls/win32u/message.c | 20 ++++++++++++++++++-- dlls/wineandroid.drv/android.h | 5 +++-- dlls/wineandroid.drv/window.c | 9 +++++---- dlls/winemac.drv/event.c | 18 +++++++++--------- dlls/winemac.drv/macdrv.h | 5 +++-- dlls/winex11.drv/event.c | 18 +++++++++--------- dlls/winex11.drv/x11drv.h | 5 +++-- include/wine/gdi_driver.h | 4 ++-- 11 files changed, 62 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9b63580018354c5a7c…

1 0

Eric Pouech : include/msvcrt: Redefine towlower* & towupper* with wint_t types.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 69ab9568b28b594160ffae3ce5fef9439fe74ae3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ab9568b28b594160ffae3c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon May 2 16:10:42 2022 +0200 include/msvcrt: Redefine towlower* & towupper* with wint_t types. It conflicts in C++ compilation with MINGW builtin definitions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wctype.h | 8 ++++---- include/msvcrt/wctype.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index 33f91db9719..9661ab5e596 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -36,8 +36,8 @@ _ACRTIMP int __cdecl _iswprint_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswpunct_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswspace_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswupper_l(wint_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t); -_ACRTIMP wchar_t __cdecl _towupper_l(wchar_t,_locale_t); +_ACRTIMP wint_t __cdecl _towlower_l(wint_t,_locale_t); +_ACRTIMP wint_t __cdecl _towupper_l(wint_t,_locale_t); _ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); _ACRTIMP int __cdecl isleadbyte(int); _ACRTIMP int __cdecl iswalnum(wint_t); @@ -54,8 +54,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #ifdef __cplusplus } diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index 2cf4636a88b..27a6adcd922 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -64,8 +64,8 @@ _ACRTIMP int __cdecl iswpunct(wint_t); _ACRTIMP int __cdecl iswspace(wint_t); _ACRTIMP int __cdecl iswupper(wint_t); _ACRTIMP int __cdecl iswxdigit(wint_t); -_ACRTIMP wchar_t __cdecl towlower(wchar_t); -_ACRTIMP wchar_t __cdecl towupper(wchar_t); +_ACRTIMP wint_t __cdecl towlower(wint_t); +_ACRTIMP wint_t __cdecl towupper(wint_t); #endif /* _WCTYPE_DEFINED */ typedef wchar_t wctrans_t;

1 0

Jacek Caban : winex11: Directly use wine_nt_to_unix_file_name to get Unix path name.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 12326097116b1e60b191e274d9199814323610c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12326097116b1e60b191e274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 21:07:09 2022 +0200 winex11: Directly use wine_nt_to_unix_file_name to get Unix path name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 80 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 430bc6c1c81..30534af6bf3 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -76,6 +76,8 @@ #include <time.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "x11drv.h" #ifdef HAVE_X11_EXTENSIONS_XFIXES_H @@ -598,6 +600,78 @@ static WCHAR *get_dos_file_name( const char *path ) } +/*********************************************************************** + * get_nt_pathname + * + * Simplified version of RtlDosPathNameToNtPathName_U. + */ +static BOOL get_nt_pathname( const WCHAR *name, UNICODE_STRING *nt_name ) +{ + static const WCHAR ntprefixW[] = {'\\','?','?','\\'}; + static const WCHAR uncprefixW[] = {'U','N','C','\\'}; + size_t len = lstrlenW( name ); + WCHAR *ptr; + + nt_name->MaximumLength = (len + 8) * sizeof(WCHAR); + if (!(ptr = malloc( nt_name->MaximumLength ))) return FALSE; + nt_name->Buffer = ptr; + + memcpy( ptr, ntprefixW, sizeof(ntprefixW) ); + ptr += ARRAYSIZE(ntprefixW); + if (name[0] == '\\' && name[1] == '\\') + { + if ((name[2] == '.' || name[2] == '?') && name[3] == '\\') + { + name += 4; + len -= 4; + } + else + { + memcpy( ptr, uncprefixW, sizeof(uncprefixW) ); + ptr += ARRAYSIZE(uncprefixW); + name += 2; + len -= 2; + } + } + memcpy( ptr, name, (len + 1) * sizeof(WCHAR) ); + ptr += len; + nt_name->Length = (ptr - nt_name->Buffer) * sizeof(WCHAR); + return TRUE; +} + + +/* based on wine_get_unix_file_name */ +char *get_unix_file_name( const WCHAR *dosW ) +{ + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + ULONG size = 256; + char *buffer; + + if (!get_nt_pathname( dosW, &nt_name )) return NULL; + InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); + for (;;) + { + if (!(buffer = malloc( size ))) + { + free( nt_name.Buffer ); + return NULL; + } + status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); + if (status != STATUS_BUFFER_TOO_SMALL) break; + free( buffer ); + } + free( nt_name.Buffer ); + if (status) + { + free( buffer ); + return NULL; + } + return buffer; +} + + /*********************************************************************** * uri_to_dos * @@ -1421,7 +1495,7 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, UINT uriSize; UINT u; - unixFilename = wine_get_unix_file_name( ptr ); + unixFilename = get_unix_file_name( ptr ); if (unixFilename == NULL) goto failed; ptr += lstrlenW( ptr ) + 1; @@ -1439,7 +1513,7 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, } else { - HeapFree(GetProcessHeap(), 0, unixFilename); + free( unixFilename ); goto failed; } } @@ -1455,7 +1529,7 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, } textUriList[next++] = '\r'; textUriList[next++] = '\n'; - HeapFree(GetProcessHeap(), 0, unixFilename); + free( unixFilename ); } put_property( display, win, prop, target, 8, textUriList, next ); free( textUriList );

1 0

Huw Davies : wineoss: Build with msvcrt.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: f23edac0608317769dac390a8dbcd44ae210d5cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f23edac0608317769dac390a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 3 07:42:32 2022 +0100 wineoss: Build with msvcrt. 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/Makefile.in | 2 -- dlls/wineoss.drv/mmdevdrv.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index 13fb18b6004..d41aa0113c8 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -6,8 +6,6 @@ DELAYIMPORTS = winmm EXTRALIBS = $(OSS4_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(OSS4_CFLAGS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ midi.c \ midipatch.c \ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9e3380ca8d9..c282ff14f01 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -39,7 +39,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -391,7 +390,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int name_size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); unsigned int dev_size = strlen(params.endpoints[i].device) + 1; OSSDevice *oss_dev;

1 0

Huw Davies : wineoss: Move AUXDM_GETNUMDEVS to the unixlib.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: b1f550651ca9ef171f26ef7f7d720b86de2d874a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f550651ca9ef171f26ef7f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 3 07:42:29 2022 +0100 wineoss: Move AUXDM_GETNUMDEVS 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/mmaux.c | 59 ++++++++++++++----------------------------- dlls/wineoss.drv/oss.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 11 ++++++++ 3 files changed, 93 insertions(+), 40 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 02ef912bd34..9fb1eeb7cd7 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -32,40 +32,20 @@ #include "windef.h" #include "winbase.h" #include "mmddk.h" -#include "wine/unicode.h" +#include "audioclient.h" + #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/unixlib.h" + +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(mmaux); #define MIXER_DEV "/dev/mixer" -static int NumDev = 6; - -/*-----------------------------------------------------------------------*/ - -static LRESULT OSS_AuxInit(void) -{ - int mixer; - TRACE("()\n"); - - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - NumDev = 0; - } else { - close(mixer); - NumDev = 6; - } - return 0; -} - /*-----------------------------------------------------------------------*/ -static LRESULT OSS_AuxExit(void) -{ - TRACE("()\n"); - return 0; -} - DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); @@ -225,29 +205,28 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct aux_message_params params; + UINT err; + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case DRVM_INIT: - return OSS_AuxInit(); - case DRVM_EXIT: - return OSS_AuxExit(); - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; case AUXDM_GETDEVCAPS: return AUX_GetDevCaps(wDevID, (LPAUXCAPSW)dwParam1, dwParam2); - case AUXDM_GETNUMDEVS: - TRACE("return %d;\n", NumDev); - return NumDev; case AUXDM_GETVOLUME: return AUX_GetVolume(wDevID, (LPDWORD)dwParam1); case AUXDM_SETVOLUME: return AUX_SetVolume(wDevID, dwParam1); - default: - WARN("unknown message !\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + OSS_CALL(aux_message, &params); + + return err; } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a5aea9ee724..d469bbebb4e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "initguid.h" #include "audioclient.h" +#include "mmddk.h" #include "wine/debug.h" #include "wine/unixlib.h" @@ -1380,6 +1381,67 @@ static NTSTATUS is_started(void *args) return oss_unlock_result(stream, &params->result, stream->playing ? S_OK : S_FALSE); } +/* Aux driver */ + +static unsigned int num_aux; + +#define MIXER_DEV "/dev/mixer" + +static UINT aux_init(void) +{ + int mixer; + + TRACE("()\n"); + + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + num_aux = 0; + } + else + { + close(mixer); + num_aux = 6; + } + return 0; +} + +static UINT aux_exit(void) +{ + TRACE("()\n"); + return 0; +} + +static NTSTATUS aux_message(void *args) +{ + struct aux_message_params *params = args; + + switch (params->msg) + { + case DRVM_INIT: + *params->err = aux_init(); + break; + case DRVM_EXIT: + *params->err = aux_exit(); + break; + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + *params->err = 0; + break; + case AUXDM_GETNUMDEVS: + TRACE("return %d;\n", num_aux); + *params->err = num_aux; + break; + default: + WARN("unknown message !\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + break; + } + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -1409,4 +1471,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, + aux_message, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 6a7dc9288d9..25e9a7007b3 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -250,6 +250,16 @@ struct midi_notify_wait_params struct notify_context *notify; }; +struct aux_message_params +{ + UINT dev_id; + UINT msg; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; +}; + enum oss_funcs { oss_test_connect, @@ -279,6 +289,7 @@ enum oss_funcs oss_midi_out_message, oss_midi_in_message, oss_midi_notify_wait, + oss_aux_message, }; NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN;

1 0

Huw Davies : wineoss: Use AUXDM_GETNUMDEVS to retrieve the number of devices.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: f278194caf66cef40cc7e091b0c39cc1e22f94f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f278194caf66cef40cc7e091… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 3 07:42:28 2022 +0100 wineoss: Use AUXDM_GETNUMDEVS to retrieve the number of devices. This is temporary and allows the global variable to move 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/mmaux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 7d0b8ed53cc..02ef912bd34 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -66,6 +66,9 @@ static LRESULT OSS_AuxExit(void) return 0; } +DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2); + /************************************************************************** * AUX_GetDevCaps [internal] */ @@ -73,10 +76,11 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) { int mixer, volume; static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; + unsigned int num_aux = OSS_auxMessage(0, AUXDM_GETNUMDEVS, 0, 0, 0); TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize); if (lpCaps == NULL) return MMSYSERR_NOTENABLED; - if (wDevID >= NumDev) return MMSYSERR_BADDEVICEID; + if (wDevID >= num_aux) return MMSYSERR_BADDEVICEID; if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { WARN("mixer device not available !\n"); return MMSYSERR_NOTENABLED;

1 0

Alexandre Julliard : shlwapi: Fix copy/paste typo in number format initialization.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 88a91169c5299c2eb4df5438b5052b08b10b118f URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a91169c5299c2eb4df5438… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:33:39 2022 +0200 shlwapi: Fix copy/paste typo in number format initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 49aef6d12aa..77e3b978cee 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -56,7 +56,7 @@ static void FillNumberFmt(NUMBERFMTW *fmt, LPWSTR decimal_buffer, int decimal_bu WCHAR *c; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->LeadingZero)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->LeadingZero, sizeof(fmt->NegativeOrder)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt->NegativeOrder, sizeof(fmt->NegativeOrder)/sizeof(WCHAR)); fmt->NumDigits = 0; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal_buffer, decimal_bufwlen); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand_buffer, thousand_bufwlen);

1 0

Alexandre Julliard : oleaut32: Use the locale leading zero flag instead of hardcoding it.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: c8fd78317902f80084a626d20aa3dfeb12572b65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8fd78317902f80084a626d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:33:21 2022 +0200 oleaut32: Use the locale leading zero flag instead of hardcoding it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3850fec7066..bc8bd0d2197 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6512,12 +6512,14 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl NUMBERFMTW minFormat; minFormat.NumDigits = 0; - minFormat.LeadingZero = 0; minFormat.Grouping = 0; minFormat.lpDecimalSep = lpDecimalSep; minFormat.lpThousandSep = empty; minFormat.NegativeOrder = 1; /* NLS_NEG_LEFT */ + GetLocaleInfoW(lcid, LOCALE_ILZERO | LOCALE_RETURN_NUMBER | (dwFlags & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&minFormat.LeadingZero, sizeof(DWORD)/sizeof(WCHAR) ); + /* count number of decimal digits in string */ p = wcschr( buff, '.' ); if (p) minFormat.NumDigits = lstrlenW(p + 1);

1 0

Alexandre Julliard : kernelbase: Reimplement GetCurrencyFormatW/Ex() using get_locale_info().
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 9afc20949a4d63c4d1323683aeda4f7af13f3969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9afc20949a4d63c4d1323683… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 10:37:38 2022 +0200 kernelbase: Reimplement GetCurrencyFormatW/Ex() using get_locale_info(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 371 ---------------------------------------- dlls/kernel32/tests/locale.c | 20 +++ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 205 ++++++++++++++++++++++ 5 files changed, 229 insertions(+), 375 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9afc20949a4d63c4d132…

1 0