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

Zebediah Figura : win32u: Move raw input device list management from user32.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 0a930890192726e64bc6207c0d04f44e4c849b7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a930890192726e64bc6207c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 18:25:56 2022 -0500 win32u: Move raw input device list management from user32. --- dlls/user32/rawinput.c | 433 +----------------------------------------- dlls/user32/user32.spec | 4 +- dlls/user32/user_main.c | 2 - dlls/user32/user_private.h | 6 - dlls/win32u/message.c | 5 +- dlls/win32u/ntuser_private.h | 2 - dlls/win32u/rawinput.c | 434 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/syscall.c | 2 + dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 1 + dlls/wow64win/syscall.h | 2 + dlls/wow64win/user.c | 55 ++++++ include/ntuser.h | 2 + 13 files changed, 503 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a930890192726e64bc6…

1 0

Alexandre Julliard : ntdll: Add memcpy_s and memmove_s.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: cbf5ad74fcf40a56788933d962cb157a0b3bacb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf5ad74fcf40a56788933d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:52:23 2022 +0200 ntdll: Add memcpy_s and memmove_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0cda13586f4..2a119c9a508 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1581,7 +1581,9 @@ @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) +@ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) +@ cdecl memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) @ cdecl pow(double double) @ cdecl qsort(ptr long long ptr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 1bea000b2bd..c0db6f832ef 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -142,6 +142,42 @@ void * __cdecl memmove( void *dst, const void *src, size_t n ) } +/********************************************************************* + * memcpy_s (MSVCRT.@) + */ +errno_t __cdecl memcpy_s( void *dst, size_t len, const void *src, size_t count ) +{ + if (!count) return 0; + if (!dst) return EINVAL; + if (!src) + { + memset( dst, 0, len ); + return EINVAL; + } + if (count > len) + { + memset( dst, 0, len ); + return ERANGE; + } + memmove( dst, src, count ); + return 0; +} + + +/********************************************************************* + * memmove_s (MSVCRT.@) + */ +errno_t __cdecl memmove_s( void *dst, size_t len, const void *src, size_t count ) +{ + if (!count) return 0; + if (!dst) return EINVAL; + if (!src) return EINVAL; + if (count > len) return ERANGE; + memmove( dst, src, count ); + return 0; +} + + static inline void memset_aligned_32( unsigned char *d, uint64_t v, size_t n ) { unsigned char *end = d + n;

1 0

Eric Pouech : winedbg: No longer hide current WineDbg process from 'info proc'.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: f8d3c2b2030b1a59a329e646caeb614167a24b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8d3c2b2030b1a59a329e646… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 29 13:11:40 2022 +0200 winedbg: No longer hide current WineDbg process from 'info proc'. We used to hide current WineDbg instance when displaying processes' list (command 'info proc'). This can potentially generate some "dangling" processes in the hierarchy (related to this WineDbg instance): - conhost.exe - start.exe (when launched from unix shell without full path to winedbg.exe) Also, print a more comprehensive error message when trying to attach to itself (now that debugger's PID is more easily available). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 17 ++++++++++------- programs/winedbg/tgt_active.c | 7 ++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index bb933aeb455..ae0fd90e938 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -498,14 +498,18 @@ static unsigned get_parent(const struct dump_proc* dp, unsigned idx) static void dump_proc_info(const struct dump_proc* dp, unsigned idx, unsigned depth) { struct dump_proc_entry* dpe; + char info; for ( ; idx != -1; idx = dp->entries[idx].sibling) { assert(idx < dp->count); dpe = &dp->entries[idx]; - dbg_printf("%c%08lx %-8ld ", - (dpe->proc.th32ProcessID == (dbg_curr_process ? - dbg_curr_process->pid : 0)) ? '>' : ' ', - dpe->proc.th32ProcessID, dpe->proc.cntThreads); + if (dbg_curr_process && dpe->proc.th32ProcessID == dbg_curr_process->pid) + info = '>'; + else if (dpe->proc.th32ProcessID == GetCurrentProcessId()) + info = '='; + else + info = ' '; + dbg_printf("%c%08lx %-8ld ", info, dpe->proc.th32ProcessID, dpe->proc.cntThreads); if (depth) { unsigned i; @@ -537,11 +541,10 @@ void info_win32_processes(void) dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); ok = Process32First(snap, &dp.entries[dp.count].proc); - /* fetch all process information into dp (skipping this debugger) */ + /* fetch all process information into dp */ while (ok) { - if (dp.entries[dp.count].proc.th32ProcessID != GetCurrentProcessId()) - dp.entries[dp.count++].children = -1; + dp.entries[dp.count++].children = -1; if (dp.count >= dp.alloc) { dp.entries = HeapReAlloc(GetProcessHeap(), 0, dp.entries, sizeof(*dp.entries) * (dp.alloc *= 2)); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c17a6f38290..9e11de69bc9 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -70,9 +70,14 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de); */ BOOL dbg_attach_debuggee(DWORD pid) { + if (pid == GetCurrentProcessId()) + { + dbg_printf("WineDbg can't debug its own process. Please use another process ID.\n"); + return FALSE; + } if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, pid, 0))) return FALSE; - if (!DebugActiveProcess(pid)) + if (!DebugActiveProcess(pid)) { dbg_printf("Can't attach process %04lx: error %lu\n", pid, GetLastError()); dbg_del_process(dbg_curr_process);

1 0

Eric Pouech : dbghelp/msc: Support LF_INDEX* in enumeration type definition.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: bb52ed35327bcdc9a85ff6b771c0b04da6cb78c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb52ed35327bcdc9a85ff6b7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 29 14:54:13 2022 +0200 dbghelp/msc: Support LF_INDEX* in enumeration type definition. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1c58b0e9cf6..ce2ad9b4e01 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -907,6 +907,18 @@ static BOOL codeview_add_type_enum_field_list(struct codeview_type_parse* ctp, break; } + case LF_INDEX_V1: + if (!codeview_add_type_enum_field_list(ctp, symt, type->index_v1.ref)) + return FALSE; + ptr += 2 + 2; + break; + + case LF_INDEX_V2: + if (!codeview_add_type_enum_field_list(ctp, symt, type->index_v2.ref)) + return FALSE; + ptr += 2 + 2 + 4; + break; + default: FIXME("Unsupported type %04x in ENUM field list\n", type->generic.id); return FALSE;

1 0

Alexandre Julliard : ntdll: Add strlwr_s and wcslwr_s.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: a15c55e658a0065709ae1b327e0f238cded4d51a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a15c55e658a0065709ae1b32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:51:07 2022 +0200 ntdll: Add strlwr_s and wcslwr_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 21 +++++++++++++++++++-- dlls/ntdll/wcstring.c | 24 ++++++++++++++++++------ 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 18055fe3b9c..91c56d4d92c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1521,6 +1521,7 @@ @ cdecl _strcmpi(str str) _stricmp @ cdecl _stricmp(str str) @ cdecl _strlwr(str) +@ cdecl _strlwr_s(str long) @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) @ cdecl _tolower(long) @@ -1536,6 +1537,7 @@ @ cdecl _vswprintf(ptr wstr ptr) @ cdecl _wcsicmp(wstr wstr) @ cdecl _wcslwr(wstr) +@ cdecl _wcslwr_s(wstr long) @ cdecl _wcsnicmp(wstr wstr long) @ cdecl _wcsupr(wstr) @ cdecl _wtoi(wstr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index d0330f48926..8fbce780eb2 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -444,7 +444,7 @@ errno_t __cdecl strncpy_s( char *dst, size_t len, const char *src, size_t count */ size_t __cdecl strnlen( const char *str, size_t len ) { - const char *s = str; + const char *s; for (s = str; len && *s; s++, len--) ; return s - str; } @@ -620,11 +620,28 @@ LPSTR __cdecl _strupr( LPSTR str ) LPSTR __cdecl _strlwr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = tolower(*str); + for ( ; *str; str++) if (*str >= 'A' && *str <= 'Z') *str += 'a' - 'A'; return ret; } +/********************************************************************* + * _strlwr_s (NTDLL.@) + */ +errno_t __cdecl _strlwr_s( char *str, size_t len ) +{ + if (!str) return EINVAL; + + if (strnlen( str, len ) == len) + { + *str = 0; + return EINVAL; + } + _strlwr( str ); + return 0; +} + + /********************************************************************* * toupper (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index ed9e1612918..b2662cb9cf1 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -108,14 +108,26 @@ int __cdecl _wcsicmp( LPCWSTR str1, LPCWSTR str2 ) LPWSTR __cdecl _wcslwr( LPWSTR str ) { WCHAR *ret = str; + for ( ; *str; str++) if (*str >= 'A' && *str <= 'Z') *str += 'a' - 'A'; + return ret; +} - while (*str) + +/********************************************************************* + * _wcslwr_s (NTDLL.@) + */ +errno_t __cdecl _wcslwr_s( wchar_t *str, size_t len ) +{ + if (!str) return EINVAL; + + if (wcsnlen( str, len ) == len) { - WCHAR ch = *str; - if (ch >= 'A' && ch <= 'Z') ch += 32; - *str++ = ch; + *str = 0; + return EINVAL; } - return ret; + + _wcslwr( str ); + return 0; } @@ -380,7 +392,7 @@ errno_t __cdecl wcsncpy_s( wchar_t *dst, size_t len, const wchar_t *src, size_t */ size_t __cdecl wcsnlen( const WCHAR *str, size_t len ) { - const WCHAR *s = str; + const WCHAR *s; for (s = str; len && *s; s++, len--) ; return s - str; }

1 0

Rémi Bernon : mf: Uninitialize renderer before creating mixer and presenter.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 90696fe884ed42cb58feae0fd53ad1f4d0281bc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90696fe884ed42cb58feae0f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 27 13:43:18 2022 +0200 mf: Uninitialize renderer before creating mixer and presenter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/evr.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 90702ff3d95..c9506af9143 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1702,11 +1702,8 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere return hr; } -static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer, - IMFVideoPresenter *presenter) +static void video_renderer_uninitialize(struct video_renderer *renderer) { - HRESULT hr; - video_renderer_release_services(renderer); if (renderer->mixer) @@ -1726,6 +1723,12 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra IUnknown_Release(renderer->device_manager); renderer->device_manager = NULL; } +} + +static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + HRESULT hr; renderer->mixer = mixer; IMFTransform_AddRef(renderer->mixer); @@ -1747,11 +1750,22 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, TRACE("%p, %p, %p.\n", iface, mixer, presenter); + EnterCriticalSection(&renderer->cs); + + if (renderer->flags & EVR_SHUT_DOWN) + { + LeaveCriticalSection(&renderer->cs); + return MF_E_SHUTDOWN; + } + + video_renderer_uninitialize(renderer); + if (mixer) IMFTransform_AddRef(mixer); else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer))) { WARN("Failed to create default mixer object, hr %#lx.\n", hr); + LeaveCriticalSection(&renderer->cs); return hr; } @@ -1760,21 +1774,15 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter))) { WARN("Failed to create default presenter, hr %#lx.\n", hr); + LeaveCriticalSection(&renderer->cs); IMFTransform_Release(mixer); return hr; } - EnterCriticalSection(&renderer->cs); - - if (renderer->flags & EVR_SHUT_DOWN) - hr = MF_E_SHUTDOWN; - else - { - /* FIXME: check clock state */ - /* FIXME: check that streams are not initialized */ + /* FIXME: check clock state */ + /* FIXME: check that streams are not initialized */ - hr = video_renderer_initialize(renderer, mixer, presenter); - } + hr = video_renderer_initialize(renderer, mixer, presenter); LeaveCriticalSection(&renderer->cs);

1 0

Alexandre Julliard : ntdll: Add a few more isw* functions.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: c948a6cf9201152a664ab4976da51bdfac59deaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c948a6cf9201152a664ab497… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:48:20 2022 +0200 ntdll: Add a few more isw* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/wcstring.c | 83 ++++++++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..fa1941ec811 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1560,10 +1560,14 @@ @ cdecl ispunct(long) @ cdecl isspace(long) @ cdecl isupper(long) +@ cdecl iswalnum(long) @ cdecl iswalpha(long) +@ cdecl iswascii(long) @ cdecl iswctype(long long) @ cdecl iswdigit(long) +@ cdecl iswgraph(long) @ cdecl iswlower(long) +@ cdecl iswprint(long) @ cdecl iswspace(long) @ cdecl iswxdigit(long) @ cdecl isxdigit(long) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 9422e4f676c..eef3197c4fe 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -384,77 +384,84 @@ INT __cdecl iswctype( WCHAR wc, unsigned short type ) } +/********************************************************************* + * iswalnum (NTDLL.@) + */ +INT __cdecl iswalnum( WCHAR wc ) +{ + return iswctype( wc, C1_ALPHA | C1_UPPER | C1_LOWER | C1_DIGIT ); +} + + /********************************************************************* * iswalpha (NTDLL.@) */ INT __cdecl iswalpha( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & (C1_ALPHA | C1_UPPER | C1_LOWER); + return iswctype( wc, C1_ALPHA | C1_UPPER | C1_LOWER ); } /********************************************************************* - * iswdigit (NTDLL.@) - * - * Checks if a unicode char wc is a digit - * - * RETURNS - * TRUE: The unicode char wc is a digit. - * FALSE: Otherwise + * iswascii (NTDLL.@) + */ +INT __cdecl iswascii( WCHAR wc ) +{ + return wc < 0x80; +} + + +/********************************************************************* + * iswdigit (NTDLL.@) */ INT __cdecl iswdigit( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & C1_DIGIT; + return iswctype( wc, C1_DIGIT ); } /********************************************************************* - * iswlower (NTDLL.@) - * - * Checks if a unicode char wc is a lower case letter - * - * RETURNS - * TRUE: The unicode char wc is a lower case letter. - * FALSE: Otherwise + * iswgraph (NTDLL.@) + */ +INT __cdecl iswgraph( WCHAR wc ) +{ + return iswctype( wc, C1_ALPHA | C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT ); +} + + +/********************************************************************* + * iswlower (NTDLL.@) */ INT __cdecl iswlower( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & C1_LOWER; + return iswctype( wc, C1_LOWER ); } /********************************************************************* - * iswspace (NTDLL.@) - * - * Checks if a unicode char wc is a white space character - * - * RETURNS - * TRUE: The unicode char wc is a white space character. - * FALSE: Otherwise + * iswprint (NTDLL.@) + */ +INT __cdecl iswprint( WCHAR wc ) +{ + return iswctype( wc, C1_ALPHA | C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_BLANK ); +} + + +/********************************************************************* + * iswspace (NTDLL.@) */ INT __cdecl iswspace( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & C1_SPACE; + return iswctype( wc, C1_SPACE ); } /********************************************************************* - * iswxdigit (NTDLL.@) - * - * Checks if a unicode char wc is an extended digit - * - * RETURNS - * TRUE: The unicode char wc is an extended digit. - * FALSE: Otherwise + * iswxdigit (NTDLL.@) */ INT __cdecl iswxdigit( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & C1_XDIGIT; + return iswctype( wc, C1_XDIGIT ); }

1 0

Hugh McMaster : regedit: Pass correct data size when adding a new value via the GUI.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 9c30f3d97ad2dc8b65409d7f3e70d3e2a159571c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c30f3d97ad2dc8b65409d7f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 29 15:49:24 2022 +1000 regedit: Pass correct data size when adding a new value via the GUI. This bug was exposed by 3b1faf59f60c2e5d91321fd8998dd81d90a13e11 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index c19ef1506fa..47ce233039e 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -443,6 +443,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW LONG lRet = ERROR_SUCCESS; WCHAR newValue[256]; UINT64 value = 0; + DWORD size_bytes; BOOL result = FALSE; int valueNum, index; HKEY hKey; @@ -466,15 +467,34 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } - - lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE *)&value, sizeof(value)); + + switch (valueType) + { + case REG_DWORD: + case REG_DWORD_BIG_ENDIAN: + size_bytes = sizeof(DWORD); + break; + case REG_QWORD: + size_bytes = sizeof(UINT64); + break; + case REG_BINARY: + size_bytes = 0; + break; + case REG_MULTI_SZ: + size_bytes = 2 * sizeof(WCHAR); + break; + default: /* REG_NONE, REG_SZ, REG_EXPAND_SZ */ + size_bytes = sizeof(WCHAR); + } + + lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE *)&value, size_bytes); if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } /* Add the new item to the listview */ - index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&value, sizeof(value), -1); + index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&value, size_bytes, -1); item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, index, (LPARAM)&item);

1 0

Alexandre Julliard : ntdll: Add strncat_s and wcsncat_s.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 7c70b9397f3ece7db9022760aa18d7af63b19f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c70b9397f3ece7db9022760… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:49:55 2022 +0200 ntdll: Add strncat_s and wcsncat_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 95b2e652b3d..e02c4278deb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1595,6 +1595,7 @@ @ cdecl strcspn(str str) @ cdecl strlen(str) @ cdecl strncat(str str long) +@ cdecl strncat_s(str long str long) @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) @ cdecl strncpy_s(ptr long str long) @@ -1626,6 +1627,7 @@ @ cdecl wcscspn(wstr wstr) @ cdecl wcslen(wstr) @ cdecl wcsncat(wstr wstr long) +@ cdecl wcsncat_s(wstr long wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) @ cdecl wcsncpy_s(ptr long wstr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 212cd30e2f1..6c4ac47803a 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -332,6 +332,47 @@ char * __cdecl strncat( char *dst, const char *src, size_t len ) } +/********************************************************************* + * strncat_s (NTDLL.@) + */ +errno_t __cdecl strncat_s( char *dst, size_t len, const char *src, size_t count ) +{ + size_t i, j; + + if (!dst || !len) return EINVAL; + if (!count) return 0; + if (!src) + { + *dst = 0; + return EINVAL; + } + + for (i = 0; i < len; i++) if (!dst[i]) break; + + if (i == len) + { + *dst = 0; + return EINVAL; + } + + for (j = 0; (j + i) < len; j++) + { + if (count == _TRUNCATE && j + i == len - 1) + { + dst[j + i] = 0; + return STRUNCATE; + } + if (j == count || !(dst[j + i] = src[j])) + { + dst[j + i] = 0; + return 0; + } + } + *dst = 0; + return ERANGE; +} + + /********************************************************************* * strncmp (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index cb45986207d..e481c89ca71 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -268,6 +268,47 @@ LPWSTR __cdecl wcsncat( LPWSTR s1, LPCWSTR s2, size_t n ) } +/********************************************************************* + * wcsncat_s (NTDLL.@) + */ +errno_t __cdecl wcsncat_s( wchar_t *dst, size_t len, const wchar_t *src, size_t count ) +{ + size_t i, j; + + if (!dst || !len) return EINVAL; + if (!count) return 0; + if (!src) + { + *dst = 0; + return EINVAL; + } + + for (i = 0; i < len; i++) if (!dst[i]) break; + + if (i == len) + { + *dst = 0; + return EINVAL; + } + + for (j = 0; (j + i) < len; j++) + { + if (count == _TRUNCATE && j + i == len - 1) + { + dst[j + i] = 0; + return STRUNCATE; + } + if (j == count || !(dst[j + i] = src[j])) + { + dst[j + i] = 0; + return 0; + } + } + *dst = 0; + return ERANGE; +} + + /********************************************************************* * wcsncmp (NTDLL.@) */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: a354bb18fabb9b4aaddac829fb24adb50dc802e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a354bb18fabb9b4aaddac829… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jun 29 00:21:48 2022 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 54 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) diff --git a/po/lt.po b/po/lt.po index 41536a396d8..e5fb27b9654 100644 --- a/po/lt.po +++ b/po/lt.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-06-25 00:18+0300\n" +"PO-Revision-Date: 2022-06-29 00:21+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15847,56 +15847,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -15980,7 +15930,7 @@ msgstr "" " <tipas> privalo būti vienas iš:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " Jei [/t] nenurodytas, numatytasis duomenų tipas yra REG_SZ.\n" "\n"

1 0