May 2018 - Wine-devel - list.winehq.org

[PATCH 06/11] regedit: Use the ARRAY_SIZE macro
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 2 +- programs/regedit/listview.c | 2 +- programs/regedit/regedit.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index ceeeb1d75a..56ef59d3ff 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -138,7 +138,7 @@ static LPWSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { if (hRootKey) parts[1] = GetRootKeyName(hRootKey); if (bFull) { - DWORD dwSize = sizeof(text)/sizeof(WCHAR); + DWORD dwSize = ARRAY_SIZE(text); GetComputerNameW(text, &dwSize); parts[0] = text; } diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4f3593fe7c..e8bfb527b5 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -241,7 +241,7 @@ static BOOL CreateListColumns(HWND hWndListView) lvC.iSubItem = index; lvC.cx = default_column_widths[index]; lvC.fmt = column_alignment[index]; - LoadStringW(hInst, IDS_LIST_COLUMN_FIRST + index, szText, sizeof(szText)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_LIST_COLUMN_FIRST + index, szText, ARRAY_SIZE(szText)); if (ListView_InsertColumnW(hWndListView, index, &lvC) == -1) return FALSE; } return TRUE; diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 7e5887cd08..7469a90ac2 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -74,7 +74,7 @@ void WINAPIV output_message(unsigned int id, ...) WCHAR fmt[1536]; __ms_va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(*fmt))) + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); return; @@ -89,7 +89,7 @@ void WINAPIV error_exit(unsigned int id, ...) WCHAR fmt[1536]; __ms_va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(*fmt))) + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %u\n", GetLastError()); return; -- 2.17.0

1 0

[PATCH 05/11] regedit: Remove regproc.h
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/regproc.h | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 programs/regedit/regproc.h diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h deleted file mode 100644 index cec59e7153..0000000000 --- a/programs/regedit/regproc.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 1999 Sylvain St-Germain - * Copyright 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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 "resource.h" - - - -- 2.17.0

1 0

[PATCH 04/11] regedit: Move remaining definitions from regproc.h to main.h
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 1 - programs/regedit/edit.c | 1 - programs/regedit/framewnd.c | 1 - programs/regedit/hexedit.c | 1 - programs/regedit/listview.c | 1 - programs/regedit/main.h | 6 +++++- programs/regedit/regedit.c | 1 - programs/regedit/regproc.c | 1 - programs/regedit/regproc.h | 3 --- programs/regedit/treeview.c | 1 - 10 files changed, 5 insertions(+), 12 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 0c6d895193..ceeeb1d75a 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -24,7 +24,6 @@ #include <stdio.h> #include "main.h" -#include "regproc.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 63cc7a564c..bd6d720f2a 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -32,7 +32,6 @@ #include "wine/heap.h" #include "wine/unicode.h" #include "main.h" -#include "regproc.h" static const WCHAR* editValueName; static WCHAR* stringValueData; diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 804573e0c0..99f7686879 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -29,7 +29,6 @@ #include <shellapi.h> #include "main.h" -#include "regproc.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/unicode.h" diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index c7bdd0ae52..0d28388e21 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -37,7 +37,6 @@ #include "wine/heap.h" #include "main.h" -#include "regproc.h" /* spaces dividing hex and ASCII */ #define DIV_SPACES 4 diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 404699fab8..4f3593fe7c 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -26,7 +26,6 @@ #include <stdio.h> #include "main.h" -#include "regproc.h" #include "wine/heap.h" #include "wine/unicode.h" diff --git a/programs/regedit/main.h b/programs/regedit/main.h index c9143c1767..af61252565 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -32,7 +32,11 @@ #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) -#define MAX_NEW_KEY_LEN 128 +#define MAX_NEW_KEY_LEN 128 +#define KEY_MAX_LEN 1024 + +#define REG_FORMAT_5 1 +#define REG_FORMAT_4 2 /* Pop-Up Menus */ #define PM_COMPUTER 0 diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 1d732a850e..7e5887cd08 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -27,7 +27,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "main.h" -#include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0a34cfb049..c4900e6c6d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -32,7 +32,6 @@ #include <wine/debug.h> #include <wine/heap.h> #include "main.h" -#include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 58f707b854..cec59e7153 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -19,8 +19,5 @@ #include "resource.h" -#define KEY_MAX_LEN 1024 -#define REG_FORMAT_5 1 -#define REG_FORMAT_4 2 diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 86224e231b..9d75a31dd6 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -32,7 +32,6 @@ #include "wine/heap.h" #include "main.h" -#include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); -- 2.17.0

1 0

[PATCH 03/11] regedit: Move regedit.c functions from regproc.h to main.h
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.h | 4 ++++ programs/regedit/regproc.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index a0c93534df..c9143c1767 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -141,6 +141,10 @@ extern LPCWSTR GetValueName(HWND hwndLV); extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); extern BOOL IsDefaultValue(HWND hwndLV, int i); +/* regedit.c */ +void WINAPIV output_message(unsigned int id, ...); +void WINAPIV error_exit(unsigned int id, ...); + /* regproc.c */ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index bf963a7425..58f707b854 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,6 +24,3 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 -void WINAPIV output_message(unsigned int id, ...); -void WINAPIV error_exit(unsigned int id, ...); - -- 2.17.0

1 0

[PATCH 02/11] regedit: Move regproc.c functions from regproc.h to main.h
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.h | 10 +++++++++- programs/regedit/regedit.c | 2 ++ programs/regedit/regproc.c | 2 ++ programs/regedit/regproc.h | 6 ------ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 1d0109f9e5..a0c93534df 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -21,9 +21,9 @@ #ifndef __MAIN_H__ #define __MAIN_H__ +#include <stdio.h> #include "resource.h" - #define STATUS_WINDOW 2001 #define TREE_WINDOW 2002 #define LIST_WINDOW 2003 @@ -141,6 +141,14 @@ extern LPCWSTR GetValueName(HWND hwndLV); extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); extern BOOL IsDefaultValue(HWND hwndLV, int i); +/* regproc.c */ +void *heap_xalloc(size_t size); +void *heap_xrealloc(void *buf, size_t size); +char *GetMultiByteString(const WCHAR *strW); +BOOL import_registry_file(FILE *reg_file); +void delete_registry_key(WCHAR *reg_key_name); +BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); + /* treeview.c */ extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); extern BOOL RefreshTreeView(HWND hWndTV); diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index a69e929e48..1d732a850e 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -21,10 +21,12 @@ #include <stdio.h> #include <stdlib.h> #include <windows.h> +#include <commctrl.h> #include <shellapi.h> #include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" +#include "main.h" #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 65087c97ee..0a34cfb049 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -27,9 +27,11 @@ #include <fcntl.h> #include <io.h> #include <windows.h> +#include <commctrl.h> #include <wine/unicode.h> #include <wine/debug.h> #include <wine/heap.h> +#include "main.h" #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index bfb0cba04b..bf963a7425 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -27,9 +27,3 @@ void WINAPIV output_message(unsigned int id, ...); void WINAPIV error_exit(unsigned int id, ...); -char *GetMultiByteString(const WCHAR *strW); -void *heap_xalloc(size_t size); -void *heap_xrealloc(void *buf, size_t size); -BOOL import_registry_file(FILE *reg_file); -void delete_registry_key(WCHAR *reg_key_name); -BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); -- 2.17.0

1 0

[PATCH 01/11] regedit: Replace the COUNT_OF macro with ARRAY_SIZE
by Hugh McMaster 21 May '18

21 May '18

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/about.c | 2 +- programs/regedit/edit.c | 10 +++++----- programs/regedit/framewnd.c | 16 ++++++++-------- programs/regedit/listview.c | 2 +- programs/regedit/main.c | 4 ++-- programs/regedit/main.h | 2 +- programs/regedit/treeview.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/programs/regedit/about.c b/programs/regedit/about.c index e0e469efe1..6684dbe634 100644 --- a/programs/regedit/about.c +++ b/programs/regedit/about.c @@ -29,6 +29,6 @@ void ShowAboutBox(HWND hWnd) { WCHAR title[64]; HICON icon = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_REGEDIT), IMAGE_ICON, 48, 48, LR_SHARED ); - LoadStringW(hInst, IDS_APP_TITLE, title, COUNT_OF(title)); + LoadStringW(hInst, IDS_APP_TITLE, title, ARRAY_SIZE(title)); ShellAboutW(hWnd, title, NULL, icon); } diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 0c5fdec168..63cc7a564c 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -53,8 +53,8 @@ static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_l WCHAR *str; int ret; - LoadStringW(hInst, titleId, title, COUNT_OF(title)); - LoadStringW(hInst, resId, fmt, COUNT_OF(fmt)); + LoadStringW(hInst, titleId, title, ARRAY_SIZE(title)); + LoadStringW(hInst, resId, fmt, ARRAY_SIZE(fmt)); FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (WCHAR *)&str, 0, &va_args); @@ -93,7 +93,7 @@ static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) WCHAR buf[128]; DWORD val; - if (!GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE; + if (!GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, ARRAY_SIZE(buf))) return FALSE; if (!swscanf(buf, toHex ? percent_u : percent_x, &val)) return FALSE; wsprintfW(buf, toHex ? percent_x : percent_u, val); return SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf); @@ -243,7 +243,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) goto done; } - if (!LoadStringW(GetModuleHandleW(0), IDS_NEWKEY, newKey, COUNT_OF(newKey))) goto done; + if (!LoadStringW(GetModuleHandleW(0), IDS_NEWKEY, newKey, ARRAY_SIZE(newKey))) goto done; /* try to find a name for the key being created (maximum = 100 attempts) */ for (keyNum = 1; keyNum < 100; keyNum++) { @@ -459,7 +459,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW return FALSE; } - if (!LoadStringW(GetModuleHandleW(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; + if (!LoadStringW(GetModuleHandleW(0), IDS_NEWVALUE, newValue, ARRAY_SIZE(newValue))) goto done; /* try to find a name for the value being created (maximum = 100 attempts) */ for (valueNum = 1; valueNum < 100; valueNum++) { diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 94da217045..804573e0c0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -167,7 +167,7 @@ static void update_new_items_and_copy_keyname(HMENU hMenu, WCHAR *keyName) if (!keyName) state = MF_GRAYED; - for (i = 0; i < COUNT_OF(items); i++) + for (i = 0; i < ARRAY_SIZE(items); i++) EnableMenuItem(hMenu, items[i], state | MF_BYCOMMAND); } @@ -469,7 +469,7 @@ static BOOL ImportRegistryFile(HWND hWnd) InitOpenFileName(hWnd, &ofn); ofn.Flags |= OFN_ENABLESIZING; - LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); + LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, ARRAY_SIZE(title)); ofn.lpstrTitle = title; if (GetOpenFileNameW(&ofn)) { if (!import_registry_filename(ofn.lpstrFile)) { @@ -498,7 +498,7 @@ static BOOL ExportRegistryFile(HWND hWnd) WCHAR title[128]; InitOpenFileName(hWnd, &ofn); - LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, COUNT_OF(title)); + LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, ARRAY_SIZE(title)); ofn.lpstrTitle = title; ofn.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; @@ -676,7 +676,7 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = selected; item.pszText = buf; - item.cchTextMax = COUNT_OF(buf); + item.cchTextMax = ARRAY_SIZE(buf); SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETITEMW, 0, (LPARAM)&item); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); @@ -1065,10 +1065,10 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa CreateWindowExW(0, szChildClass, captionW, WS_CHILD | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, NULL, hInst, 0); - LoadStringW(hInst, IDS_EXPAND, expandW, COUNT_OF(expandW)); - LoadStringW(hInst, IDS_COLLAPSE, collapseW, COUNT_OF(collapseW)); - LoadStringW(hInst, IDS_EDIT_MODIFY, modifyW, COUNT_OF(modifyW)); - LoadStringW(hInst, IDS_EDIT_MODIFY_BIN, modify_binaryW, COUNT_OF(modify_binaryW)); + LoadStringW(hInst, IDS_EXPAND, expandW, ARRAY_SIZE(expandW)); + LoadStringW(hInst, IDS_COLLAPSE, collapseW, ARRAY_SIZE(collapseW)); + LoadStringW(hInst, IDS_EDIT_MODIFY, modifyW, ARRAY_SIZE(modifyW)); + LoadStringW(hInst, IDS_EDIT_MODIFY_BIN, modify_binaryW, ARRAY_SIZE(modify_binaryW)); break; case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 0934e03a39..404699fab8 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -361,7 +361,7 @@ HWND CreateListView(HWND hwndParent, UINT id) WCHAR ListView[] = {'L','i','s','t',' ','V','i','e','w',0}; /* prepare strings */ - LoadStringW(hInst, IDS_REGISTRY_VALUE_NOT_SET, g_szValueNotSet, COUNT_OF(g_szValueNotSet)); + LoadStringW(hInst, IDS_REGISTRY_VALUE_NOT_SET, g_szValueNotSet, ARRAY_SIZE(g_szValueNotSet)); /* Get the dimensions of the parent window's client area, and create the list view control. */ GetClientRect(hwndParent, &rcClient); diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 19d720d4d2..62fd616b51 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -172,8 +172,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi } /* Initialize global strings */ - LoadStringW(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, COUNT_OF(g_pszDefaultValueName)); + LoadStringW(hInstance, IDS_APP_TITLE, szTitle, ARRAY_SIZE(szTitle)); + LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, ARRAY_SIZE(g_pszDefaultValueName)); /* Store instance handle in our global variable */ hInst = hInstance; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 788de1a509..1d0109f9e5 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -30,7 +30,7 @@ #define SPLIT_WIDTH 5 -#define COUNT_OF(a) (sizeof(a)/sizeof(a[0])) +#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) #define MAX_NEW_KEY_LEN 128 diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 4bbec40df8..86224e231b 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -521,7 +521,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = hNewItem; item.pszText = buf; - item.cchTextMax = COUNT_OF(buf); + item.cchTextMax = ARRAY_SIZE(buf); if (!TreeView_GetItemW(hwndTV, &item)) continue; if (lstrcmpW(name, item.pszText) == 0) break; } -- 2.17.0

1 0

[PATCH 6/6] winmm: Reset the tick counter after handling messages.
by Akihiro Sagawa 21 May '18

21 May '18

Otherwise, events might be triggered immediately after a resuming. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH 5/6] winmm: Return a continuous stream position in MIDI stream.
by Akihiro Sagawa 21 May '18

21 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 8 ++++---- dlls/winmm/winmm.c | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 8 deletions(-)

2 1

[PATCH 3/3] mshtml/tests: Added more ref counting and aggregation tests.
by Jacek Caban 21 May '18

21 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 131 ++++++++++++++++++++++++++++++++----------- 1 file changed, 97 insertions(+), 34 deletions(-)

2 1

[PATCH 1/3] urlmon/tests: Use the same thread for both connections in redirect tests.
by Jacek Caban 21 May '18

21 May '18

Fixes a race spotted by Zebediah Figura. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/protocol.c | 58 +++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 27 deletions(-)

2 1