December 2021 - Wine-commits

Huw Davies : winecoreaudio: Switch midi_in_lock() away from a syscall prototype.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 61337a1d16639ce0a1f809be60720c6b2aeec8b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61337a1d16639ce0a1f809be… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 30 07:56:31 2021 +0000 winecoreaudio: Switch midi_in_lock() away from a syscall prototype. 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/winecoreaudio.drv/coremidi.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index ae8b71e002b..5777236bd26 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -136,13 +136,10 @@ static struct notify_context *notify_read, *notify_write; #define MAX_MIDI_SYNTHS 1 -NTSTATUS midi_in_lock(void *args) +static void midi_in_lock(BOOL lock) { - BOOL lock = !!args; - if (lock) pthread_mutex_lock(&midi_in_mutex); else pthread_mutex_unlock(&midi_in_mutex); - return STATUS_SUCCESS; } static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, @@ -228,7 +225,7 @@ static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) src->state |= 2; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); while (len) { @@ -253,7 +250,7 @@ static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) } } - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); } static void process_small_packet(struct midi_src *src, MIDIPacket *packet) @@ -981,13 +978,13 @@ static DWORD midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) hdr->dwBytesRecorded = 0; hdr->lpNext = NULL; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); next = &srcs[dev_id].lpQueueHdr; while (*next) next = &(*next)->lpNext; *next = hdr; - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); return MMSYSERR_NOERROR; } @@ -1090,7 +1087,7 @@ static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) } src = srcs + dev_id; - midi_in_lock((void *)TRUE); + midi_in_lock(TRUE); if (src->lpQueueHdr) { @@ -1102,7 +1099,7 @@ static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ } - midi_in_lock((void *)FALSE); + midi_in_lock(FALSE); return err; }

1 0

Huw Davies : winecoreaudio: Always start the notification thread.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 14029a47c9ab6d89a25a35da7be07128fbccc4ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=14029a47c9ab6d89a25a35da… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 30 07:56:32 2021 +0000 winecoreaudio: Always start the notification thread. 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/winecoreaudio.drv/coremidi.c | 9 ++------- dlls/winecoreaudio.drv/midi.c | 7 +------ dlls/winecoreaudio.drv/unixlib.h | 1 - 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5777236bd26..8c09d4a2c1b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -417,19 +417,14 @@ NTSTATUS midi_init(void *args) dests[i].caps.wNotes = 0; } - params->num_srcs = num_srcs; - *params->err = DRV_SUCCESS; return STATUS_SUCCESS; } NTSTATUS midi_release(void *args) { - if (num_srcs) - { - /* stop the notify_wait thread */ - notify_post(NULL); - } + /* stop the notify_wait thread */ + notify_post(NULL); if (midi_client) MIDIClientDispose(midi_client); /* MIDIClientDispose will close all ports */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 262713dd003..6191885553a 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -static DWORD MIDIIn_NumDevs = 0; - static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -87,10 +85,7 @@ static LONG CoreAudio_MIDIInit(void) return err; } - MIDIIn_NumDevs = params.num_srcs; - - if (MIDIIn_NumDevs > 0) - CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); return err; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index d44a7a013e8..bd9a5ce03bd 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -186,7 +186,6 @@ struct set_volumes_params struct midi_init_params { DWORD *err; - UINT num_srcs; }; struct notify_context

1 0

Huw Davies : winecoreaudio: Build with msvcrt.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: ce0e6ccb3252c1377d51ad5f22408535eebe6523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0e6ccb3252c1377d51ad5f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 30 07:56:33 2021 +0000 winecoreaudio: 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/winecoreaudio.drv/Makefile.in | 2 -- dlls/winecoreaudio.drv/midi.c | 6 +----- dlls/winecoreaudio.drv/mmdevdrv.c | 25 ++++++++++--------------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 8162eae67d7..4be396c489c 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ coreaudio.c \ coremidi.c \ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6191885553a..6c6752c0c76 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -21,23 +21,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" -#include "wine/port.h" - #include <string.h> #include <stdarg.h> #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "mmddk.h" #include "mmdeviceapi.h" #include "audioclient.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/unixlib.h" #include "coreaudio.h" diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b4cf325c9d2..128396fbe29 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -21,11 +21,11 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winreg.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/unixlib.h" @@ -126,10 +126,7 @@ typedef struct _SessionMgr { IMMDevice *device; } SessionMgr; -static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v','\\','d','e','v','i','c','e','s',0}; -static const WCHAR guidW[] = {'g','u','i','d',0}; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winecoreaudio.drv\\devices"; static HANDLE g_timer_q; @@ -253,7 +250,7 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, goto exit; } - lr = RegSetValueExW(key, guidW, 0, REG_BINARY, (BYTE*)guid, + lr = RegSetValueExW(key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(GUID)); if(lr != ERROR_SUCCESS) ERR("RegSetValueEx(%s\\guid) failed: %u\n", wine_dbgstr_w(key_name), lr); @@ -270,19 +267,17 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) DWORD type, size = sizeof(*guid); WCHAR key_name[256]; - static const WCHAR key_fmt[] = {'%','u',0}; - if(flow == eCapture) key_name[0] = '1'; else key_name[0] = '0'; key_name[1] = ','; - sprintfW(key_name + 2, key_fmt, device_id); + swprintf(key_name + 2, ARRAY_SIZE(key_name), L"%u", device_id); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ - if(RegQueryValueExW(dev_key, guidW, 0, &type, + if(RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size) == ERROR_SUCCESS){ if(type == REG_BINARY){ RegCloseKey(dev_key); @@ -322,8 +317,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, { struct get_endpoint_ids_params params; unsigned int i; - GUID *guids; - WCHAR **ids; + GUID *guids = NULL; + WCHAR **ids = NULL; TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); @@ -346,7 +341,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, } for(i = 0; i < params.num; i++){ - int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); ids[i] = heap_alloc(size); if(!ids[i]){ params.result = E_OUTOFMEMORY; @@ -402,7 +397,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) } size = sizeof(reg_guid); - if(RegQueryValueExW(key, guidW, 0, &type, + if(RegQueryValueExW(key, L"guid", 0, &type, (BYTE*)&reg_guid, &size) == ERROR_SUCCESS){ if(IsEqualGUID(&reg_guid, guid)){ RegCloseKey(key); @@ -419,7 +414,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) return FALSE; } - *id = strtoulW(key_name + 2, NULL, 10); + *id = wcstoul(key_name + 2, NULL, 10); return TRUE; }

1 0

Alexandre Julliard : include: Remove some no longer used Unicode functions.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 143bd63b27f876a3767d13a57c8810a6a87acb9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=143bd63b27f876a3767d13a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 15:56:48 2021 +0100 include: Remove some no longer used Unicode functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 4 +- dlls/wineandroid.drv/mmdevdrv.c | 1 - dlls/wineandroid.drv/window.c | 1 - dlls/winecoreaudio.drv/coreaudio.c | 2 +- dlls/winecoreaudio.drv/coremidi.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - dlls/winejoystick.drv/joystick_linux.c | 2 - dlls/wineoss.drv/midi.c | 1 - dlls/wineoss.drv/mmdevdrv.c | 1 - dlls/winex11.drv/xdnd.c | 1 - dlls/winex11.drv/xinerama.c | 1 - dlls/winex11.drv/xvidmode.c | 1 - include/wine/unicode.h | 101 --------------------------------- 13 files changed, 3 insertions(+), 116 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 5f7ea3842a0..e02b1643e30 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -41,13 +41,11 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "sspi.h" -#include "schannel.h" -#include "winreg.h" #include "secur32_priv.h" #include "wine/debug.h" -#include "wine/unicode.h" #if defined(SONAME_LIBGNUTLS) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index d9b7cde2c80..269f93115b7 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -44,7 +44,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "ole2.h" diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 997bce15964..480871f3370 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -42,7 +42,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/unicode.h" #include "android.h" #include "wine/server.h" diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index e6ce5c33e36..00bd79927ca 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -61,11 +61,11 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "mmdeviceapi.h" #include "initguid.h" #include "audioclient.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 8c09d4a2c1b..ba3b7096b7f 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -80,12 +80,12 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "mmsystem.h" #include "mmddk.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "coreaudio.h" diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2fce585c6b1..e1df3d07f99 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -50,7 +50,6 @@ #include "ddk/d3dkmthk.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #ifdef HAVE_FLOAT_H # include <float.h> #endif diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 8d1a7b1a25a..4e7e18e9e64 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -67,8 +67,6 @@ #include "winnls.h" #include "wine/debug.h" -#include "wine/unicode.h" - WINE_DEFAULT_DEBUG_CHANNEL(joystick); #define MAXJOYSTICK (JOYSTICKID2 + 30) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 1e72dfcf898..553b2ff6ea9 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -63,7 +63,6 @@ #include "winuser.h" #include "winnls.h" #include "mmddk.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(midi); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index db2c6b23914..19a59cd9ba1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -38,7 +38,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "ole2.h" diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 9472d9966bb..9eee4bee1ac 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -43,7 +43,6 @@ #include "oleidl.h" #include "objidl.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 84d197900c3..5794bcb4f74 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,7 +30,6 @@ #include "x11drv.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index c449157f6b3..79cf2e32dc5 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -43,7 +43,6 @@ #include "wingdi.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xvidmode); diff --git a/include/wine/unicode.h b/include/wine/unicode.h index d29a371fe53..cb97d62ce40 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -67,31 +67,12 @@ WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) return dst; } -WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) { strcpyW( dst + strlenW(dst), src ); return dst; } -WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ) -{ - do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); - return NULL; -} - WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; @@ -99,26 +80,6 @@ WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) return ret; } -WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) -{ - for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; - return NULL; -} - -WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) -{ - WCHAR *ret; - for (ret = str; *str; str++) *str = tolowerW(*str); - return ret; -} - -WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) -{ - const WCHAR *end; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)(ULONG_PTR)ptr; - return NULL; -} - WINE_UNICODE_INLINE int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) { for (;;) @@ -138,18 +99,6 @@ WINE_UNICODE_INLINE int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ) return ret; } -WINE_UNICODE_INLINE WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) -{ - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } - if (!*p2) return (WCHAR *)str; - str++; - } - return NULL; -} - WINE_UNICODE_INLINE LONG strtolW( LPCWSTR s, LPWSTR *end, INT base ) { BOOL negative = FALSE, empty = TRUE; @@ -198,56 +147,6 @@ WINE_UNICODE_INLINE LONG strtolW( LPCWSTR s, LPWSTR *end, INT base ) return ret; } -WINE_UNICODE_INLINE ULONG strtoulW( LPCWSTR s, LPWSTR *end, INT base ) -{ - BOOL negative = FALSE, empty = TRUE; - ULONG ret = 0; - - if (base < 0 || base == 1 || base > 36) return 0; - if (end) *end = (WCHAR *)s; - while (isspaceW(*s)) s++; - - if (*s == '-') - { - negative = TRUE; - s++; - } - else if (*s == '+') s++; - - if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) - { - base = 16; - s += 2; - } - if (base == 0) base = s[0] != '0' ? 10 : 8; - - while (*s) - { - int v; - - if ('0' <= *s && *s <= '9') v = *s - '0'; - else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; - else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; - else break; - if (v >= base) break; - s++; - empty = FALSE; - - if (ret > MAXDWORD / base || ret * base > MAXDWORD - v) - ret = MAXDWORD; - else - ret = ret * base + v; - } - - if (end && !empty) *end = (WCHAR *)s; - return negative ? -ret : ret; -} - -WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) -{ - return (int)strtolW( str, (WCHAR **)0, 10 ); -} - NTSYSAPI int __cdecl _vsnwprintf(WCHAR*,size_t,const WCHAR*,__ms_va_list); static inline int WINAPIV snprintfW( WCHAR *str, size_t len, const WCHAR *format, ...)

1 0

Alexandre Julliard : include: Remove wine/port.h.
by Alexandre Julliard 01 Dec '21

01 Dec '21

1 0

Alexandre Julliard : configure: Fix the netapi check.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 13a3340bc22b85f7294dfb72d9bc2410b804ce16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a3340bc22b85f7294dfb72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 16:54:07 2021 +0100 configure: Fix the netapi check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index aec64ea0232..8e3ec2a1363 100755 --- a/configure +++ b/configure @@ -17346,7 +17346,7 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$ac_cv_lib_soname_netapi" != xyes +if test "x$ac_cv_lib_soname_netapi" = "x" then : case "x$with_netapi" in x) as_fn_append wine_notices "|libnetapi not found, Samba NetAPI won't be supported." ;; diff --git a/configure.ac b/configure.ac index aa5396e8d06..9d88ea7cf6e 100644 --- a/configure.ac +++ b/configure.ac @@ -1684,7 +1684,7 @@ then WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,, [WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])]) fi -WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_soname_netapi" != xyes], +WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_soname_netapi" = "x"], [libnetapi not found, Samba NetAPI won't be supported.], [enable_netapi])

1 0

Eric Pouech : winedbg: Be more strict when detecting a string from an array.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 9061634a01d358dd6b071ebcca5a7567d604219e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9061634a01d358dd6b071ebc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:29:39 2021 +0100 winedbg: Be more strict when detecting a string from an array. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/types.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5e9188ccc6e..0ee6ab05f0f 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -519,24 +519,29 @@ void print_value(const struct dbg_lvalue* lvalue, char format, int level) count = 1; size = 1; types_get_info(&type, TI_GET_COUNT, &count); types_get_info(&type, TI_GET_LENGTH, &size); + lvalue_field = *lvalue; + types_get_info(&lvalue_field.type, TI_GET_TYPE, &lvalue_field.type.id); + types_get_real_type(&lvalue_field.type, &tag); - if (size == count) - { - unsigned len; - char buffer[256]; - /* - * Special handling for character arrays. - */ - /* FIXME should check basic type here (should be a char!!!!)... */ - len = min(count, sizeof(buffer)); - memory_get_string(dbg_curr_process, - memory_to_linear_addr(&lvalue->addr), - lvalue->cookie == DLV_TARGET, TRUE, buffer, len); - dbg_printf("\"%s%s\"", buffer, (len < count) ? "..." : ""); - break; + if (size == count && tag == SymTagBaseType) + { + DWORD basetype; + + types_get_info(&lvalue_field.type, TI_GET_BASETYPE, &basetype); + if (basetype == btChar) + { + char buffer[256]; + /* + * Special handling for character arrays. + */ + unsigned len = min(count, sizeof(buffer)); + memory_get_string(dbg_curr_process, + memory_to_linear_addr(&lvalue->addr), + lvalue->cookie == DLV_TARGET, TRUE, buffer, len); + dbg_printf("\"%s%s\"", buffer, (len < count) ? "..." : ""); + break; + } } - lvalue_field = *lvalue; - types_get_info(&type, TI_GET_TYPE, &lvalue_field.type.id); dbg_printf("{"); for (i = 0; i < count; i++) {

1 0

Eric Pouech : winedbg: Support # as comment delimiter in commands.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: dd59222d4ddd2c128cc50c5752effb7b76a1f92b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd59222d4ddd2c128cc50c57… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:29:46 2021 +0100 winedbg: Support # as comment delimiter in commands. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debug.l | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 875688f774f..3c9acc5fe60 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -138,6 +138,7 @@ STRING \"[^\n"]+\" if (!dbg_num_processes() && YYSTATE == INITIAL) {BEGIN(NOPROCESS);} <<EOF>> { return tEOF; } +<*>"#"[^\n]* /* Skip comments */ <*>\n { BEGIN(INITIAL); syntax_error = 0; return tEOL; } /* Indicates end of command. Reset state. */

1 0

Eric Pouech : winedbg: Display line number of syntax errors when reading a command file.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 5a94f200650b61c9cec1e10d260472334f357d37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a94f200650b61c9cec1e10d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:29:52 2021 +0100 winedbg: Display line number of syntax errors when reading a command file. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 41 +++++++++++++++++++++++++---------------- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/tgt_active.c | 6 +++--- programs/winedbg/winedbg.c | 8 +++++--- 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 3b206342946..2106b8414e8 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -452,8 +452,15 @@ static LONG WINAPI wine_dbg_cmd(EXCEPTION_POINTERS *eptr) return EXCEPTION_EXECUTE_HANDLER; } -static HANDLE dbg_parser_input; -static HANDLE dbg_parser_output; +struct parser_context +{ + const char* filename; + HANDLE input; + HANDLE output; + unsigned line_no; +}; + +static struct parser_context dbg_parser = {NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0}; int input_fetch_entire_line(const char* pfx, char** line) { @@ -465,15 +472,16 @@ int input_fetch_entire_line(const char* pfx, char** line) /* as of today, console handles can be file handles... so better use file APIs rather than * console's */ - WriteFile(dbg_parser_output, pfx, strlen(pfx), &nread, NULL); + WriteFile(dbg_parser.output, pfx, strlen(pfx), &nread, NULL); buffer = HeapAlloc(GetProcessHeap(), 0, alloc = 16); assert(buffer != NULL); + dbg_parser.line_no++; len = 0; do { - if (!ReadFile(dbg_parser_input, &ch, 1, &nread, NULL) || nread == 0) + if (!ReadFile(dbg_parser.input, &ch, 1, &nread, NULL) || nread == 0) { HeapFree(GetProcessHeap(), 0, buffer); return -1; @@ -513,25 +521,25 @@ int input_read_line(const char* pfx, char* buf, int size) * * Debugger command line parser */ -void parser_handle(HANDLE input) +void parser_handle(const char* filename, HANDLE input) { - BOOL ret_ok; - HANDLE in_copy = dbg_parser_input; - HANDLE out_copy = dbg_parser_output; + BOOL ret_ok; + struct parser_context prev = dbg_parser; ret_ok = FALSE; if (input != INVALID_HANDLE_VALUE) { - dbg_parser_output = INVALID_HANDLE_VALUE; - dbg_parser_input = input; + dbg_parser.output = INVALID_HANDLE_VALUE; + dbg_parser.input = input; } else { - dbg_parser_output = GetStdHandle(STD_OUTPUT_HANDLE); - dbg_parser_input = GetStdHandle(STD_INPUT_HANDLE); + dbg_parser.output = GetStdHandle(STD_OUTPUT_HANDLE); + dbg_parser.input = GetStdHandle(STD_INPUT_HANDLE); } - + dbg_parser.line_no = 0; + dbg_parser.filename = filename; do { __TRY @@ -547,8 +555,7 @@ void parser_handle(HANDLE input) lexeme_flush(); } while (!ret_ok); - dbg_parser_input = in_copy; - dbg_parser_output = out_copy; + dbg_parser = prev; } static void parser(const char* filename) @@ -556,13 +563,15 @@ static void parser(const char* filename) HANDLE h = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0L, 0); if (h != INVALID_HANDLE_VALUE) { - parser_handle(h); + parser_handle(filename, h); CloseHandle(h); } } static int dbg_error(const char* s) { + if (dbg_parser.filename) + dbg_printf("%s:%d:", dbg_parser.filename, dbg_parser.line_no); dbg_printf("%s\n", s); return 0; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 28126c28930..8180488d1e5 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -309,7 +309,7 @@ extern HANDLE display_crash_details(HANDLE event); extern int msgbox_res_id(HWND hwnd, UINT textId, UINT captionId, UINT uType); /* dbg.y */ -extern void parser_handle(HANDLE); +extern void parser_handle(const char*, HANDLE); extern int input_read_line(const char* pfx, char* buffer, int size); extern int input_fetch_entire_line(const char* pfx, char** line); extern HANDLE WINAPIV parser_generate_command_file(const char*, ...); @@ -476,7 +476,7 @@ extern void dbg_del_thread(struct dbg_thread* t); extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); extern BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size); extern void dbg_set_option(const char*, const char*); -extern void dbg_start_interactive(HANDLE hFile); +extern void dbg_start_interactive(const char*, HANDLE hFile); extern void dbg_init_console(void); /* gdbproxy.c */ diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 2fd05df39d9..2a2af67debe 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -865,7 +865,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) case ID_DEBUG: AllocConsole(); dbg_init_console(); - dbg_start_interactive(INVALID_HANDLE_VALUE); + dbg_start_interactive(NULL, INVALID_HANDLE_VALUE); return start_ok; case ID_DETAILS: event = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -882,7 +882,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) dbg_active_wait_for_first_exception(); dbg_interactiveP = TRUE; - parser_handle(input); + parser_handle(NULL, input); output_system_info(); if (output != INVALID_HANDLE_VALUE) @@ -963,7 +963,7 @@ enum dbg_start dbg_active_minidump(int argc, char* argv[]) dbg_active_wait_for_first_exception(); dbg_interactiveP = TRUE; - parser_handle(hFile); + parser_handle(NULL, hFile); return start_ok; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 55801536a79..659ca364544 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -562,7 +562,7 @@ static int dbg_winedbg_usage(BOOL advanced) return 0; } -void dbg_start_interactive(HANDLE hFile) +void dbg_start_interactive(const char* filename, HANDLE hFile) { struct dbg_process* p; struct dbg_process* p2; @@ -574,7 +574,7 @@ void dbg_start_interactive(HANDLE hFile) } dbg_interactiveP = TRUE; - parser_handle(hFile); + parser_handle(filename, hFile); LIST_FOR_EACH_ENTRY_SAFE(p, p2, &dbg_process_list, struct dbg_process, entry) p->process_io->close_process(p, FALSE); @@ -624,6 +624,7 @@ int main(int argc, char** argv) int retv = 0; HANDLE hFile = INVALID_HANDLE_VALUE; enum dbg_start ds; + const char* filename = NULL; /* Initialize the output */ dbg_houtput = GetStdHandle(STD_OUTPUT_HANDLE); @@ -688,6 +689,7 @@ int main(int argc, char** argv) if (!strcmp(argv[0], "--file") && argc > 1) { argc--; argv++; + filename = argv[0]; hFile = CreateFileA(argv[0], GENERIC_READ|DELETE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); if (hFile == INVALID_HANDLE_VALUE) @@ -718,7 +720,7 @@ int main(int argc, char** argv) restart_if_wow64(); - dbg_start_interactive(hFile); + dbg_start_interactive(filename, hFile); return 0; }

1 0

Eric Pouech : winedbg: Move YY_INPUT implementation to dbg.y.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 5ffd0d05a8482bad7cdd182ef16138aeec330849 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ffd0d05a8482bad7cdd182e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:29:59 2021 +0100 winedbg: Move YY_INPUT implementation to dbg.y. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 47 ++++++++++++++++++++++++++++++++++++++++++++- programs/winedbg/debug.l | 47 +-------------------------------------------- programs/winedbg/debugger.h | 2 +- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 2106b8414e8..ace29039753 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -462,7 +462,7 @@ struct parser_context static struct parser_context dbg_parser = {NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0}; -int input_fetch_entire_line(const char* pfx, char** line) +static int input_fetch_entire_line(const char* pfx, char** line) { char* buffer; char ch; @@ -501,6 +501,51 @@ int input_fetch_entire_line(const char* pfx, char** line) return len; } +size_t input_lex_read_buffer(char* buf, int size) +{ + int len; + static char* last_line = NULL; + static size_t last_line_idx = 0; + + /* try first to fetch the remaining of an existing line */ + if (last_line_idx == 0) + { + char* tmp = NULL; + /* no remaining chars to be read from last line, grab a brand new line up to '\n' */ + lexeme_flush(); + len = input_fetch_entire_line("Wine-dbg>", &tmp); + if (len < 0) return 0; /* eof */ + + /* remove carriage return in newline */ + if (len >= 2 && tmp[len - 2] == '\r') + { + tmp[len - 2] = '\n'; + tmp[len - 1] = '\0'; + len--; + } + + /* FIXME: should have a pair of buffers, and switch between the two, instead of + * reallocating a new one for each line + */ + if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) + { + HeapFree(GetProcessHeap(), 0, tmp); + } + else + { + HeapFree(GetProcessHeap(), 0, last_line); + last_line = tmp; + } + } + + len = min(strlen(last_line + last_line_idx), size - 1); + memcpy(buf, last_line + last_line_idx, len); + buf[len] = '\0'; + if ((last_line_idx += len) >= strlen(last_line)) + last_line_idx = 0; + return len; +} + int input_read_line(const char* pfx, char* buf, int size) { char* line = NULL; diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 3c9acc5fe60..a497f34e6b0 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -60,53 +60,8 @@ void lexeme_flush(void) next_lexeme = 0; } -static size_t read_input(const char* pfx, char* buf, int size) -{ - int len; - static char* last_line = NULL; - static size_t last_line_idx = 0; - - /* try first to fetch the remaining of an existing line */ - if (last_line_idx == 0) - { - char* tmp = NULL; - /* no remaining chars to be read from last line, grab a brand new line up to '\n' */ - lexeme_flush(); - len = input_fetch_entire_line(pfx, &tmp); - if (len < 0) return 0; /* eof */ - - /* remove carriage return in newline */ - if (len >= 2 && tmp[len - 2] == '\r') - { - tmp[len - 2] = '\n'; - tmp[len - 1] = '\0'; - len--; - } - - /* FIXME: should have a pair of buffers, and switch between the two, instead of - * reallocating a new one for each line - */ - if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) - { - HeapFree(GetProcessHeap(), 0, tmp); - } - else - { - HeapFree(GetProcessHeap(), 0, last_line); - last_line = tmp; - } - } - - len = min(strlen(last_line + last_line_idx), size - 1); - memcpy(buf, last_line + last_line_idx, len); - buf[len] = '\0'; - if ((last_line_idx += len) >= strlen(last_line)) - last_line_idx = 0; - return len; -} - #define YY_INPUT(buf,result,max_size) \ - (result = read_input("Wine-dbg>", buf, max_size)) + (result = input_lex_read_buffer(buf, max_size)) static int syntax_error; %} diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 8180488d1e5..c511f3f76bc 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -311,7 +311,7 @@ extern int msgbox_res_id(HWND hwnd, UINT textId, UINT captionId, UI /* dbg.y */ extern void parser_handle(const char*, HANDLE); extern int input_read_line(const char* pfx, char* buffer, int size); -extern int input_fetch_entire_line(const char* pfx, char** line); +extern size_t input_lex_read_buffer(char* pfx, int size); extern HANDLE WINAPIV parser_generate_command_file(const char*, ...); /* debug.l */

1 0