January 2017 - Wine-commits

Nikolay Sivov : comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler.
by Alexandre Julliard 11 Jan '17

11 Jan '17

Module: wine Branch: master Commit: 26067cc0b9e39ac80bd13f8c90d9c9948eb60fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=26067cc0b9e39ac80bd13f8c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 15:31:42 2017 +0300 comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 11 ++++++++++- dlls/comctl32/toolbar.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 7dcdadb..f2f7924 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1710,12 +1710,13 @@ static void test_recalc(void) static void test_getbuttoninfo(void) { HWND hToolbar = NULL; + TBBUTTONINFOW tbiW; + TBBUTTONINFOA tbi; int i; rebuild_toolbar_with_buttons(&hToolbar); for (i = 0; i < 128; i++) { - TBBUTTONINFOA tbi; int ret; tbi.cbSize = i; @@ -1727,6 +1728,14 @@ static void test_getbuttoninfo(void) compare(ret, -1, "%d"); } } + + /* TBIF_TEXT with NULL pszText */ + memset(&tbiW, 0, sizeof(tbiW)); + tbiW.cbSize = sizeof(tbiW); + tbiW.dwMask = TBIF_BYINDEX | TBIF_STYLE | TBIF_COMMAND | TBIF_TEXT; + i = SendMessageA(hToolbar, TB_GETBUTTONINFOW, 1, (LPARAM)&tbiW); + ok(i == 1, "Got index %d\n", i); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 422845c..0c545a2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3397,7 +3397,7 @@ TOOLBAR_GetButtonInfoT(const TOOLBAR_INFO *infoPtr, INT Id, LPTBBUTTONINFOW lpTb Str_GetPtrW(lpText, lpTbInfo->pszText, lpTbInfo->cchText); else Str_GetPtrWtoA(lpText, (LPSTR)lpTbInfo->pszText, lpTbInfo->cchText); - } else + } else if (!bUnicode || lpTbInfo->pszText) lpTbInfo->pszText[0] = '\0'; } return nIndex;

1 0

Ken Thomases : winemac: Change some clipboard functions to void return.
by Alexandre Julliard 11 Jan '17

11 Jan '17

Module: wine Branch: master Commit: 3208d1497aa838bdebd0a29c86f7bf52ee7fd9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3208d1497aa838bdebd0a29c8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 11 11:06:20 2017 -0600 winemac: Change some clipboard functions to void return. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3f06ed9..ff79a1e 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1623,15 +1623,14 @@ static void render_format(UINT id) * Grab the Win32 clipboard when a Mac app has taken ownership of the * pasteboard, and fill it with the pasteboard data types. */ -static BOOL grab_win32_clipboard(void) +static void grab_win32_clipboard(void) { - if (!OpenClipboard(clipboard_hwnd)) return FALSE; + if (!OpenClipboard(clipboard_hwnd)) return; EmptyClipboard(); is_clipboard_owner = TRUE; last_clipboard_update = GetTickCount64(); set_win32_clipboard_formats_from_mac_pasteboard(); CloseClipboard(); - return TRUE; } @@ -1641,27 +1640,25 @@ static BOOL grab_win32_clipboard(void) * Periodically update the clipboard while the clipboard is owned by a * Mac app. */ -static BOOL update_clipboard(void) +static void update_clipboard(void) { static BOOL updating; - BOOL ret = TRUE; TRACE("is_clipboard_owner %d last_clipboard_update %llu now %llu\n", is_clipboard_owner, last_clipboard_update, GetTickCount64()); - if (updating) return TRUE; + if (updating) return; updating = TRUE; if (is_clipboard_owner) { if (GetTickCount64() - last_clipboard_update > CLIPBOARD_UPDATE_DELAY) - ret = grab_win32_clipboard(); + grab_win32_clipboard(); } else if (!macdrv_is_pasteboard_owner(clipboard_cocoa_window)) - ret = grab_win32_clipboard(); + grab_win32_clipboard(); updating = FALSE; - return ret; }

1 0

Nikolay Sivov : comctl32/tests: Call appropriate default procedure for parent window (Valgrind).
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: dabad0e98fb79e4da9fbd063a3278255ecdb1242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabad0e98fb79e4da9fbd063a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 10:03:13 2017 +0300 comctl32/tests: Call appropriate default procedure for parent window (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5e69414..6d21b05 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -555,7 +555,10 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP } defwndproc_counter++; - ret = DefWindowProcA(hwnd, message, wParam, lParam); + if (IsWindowUnicode(hwnd)) + ret = DefWindowProcW(hwnd, message, wParam, lParam); + else + ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; return ret;

1 0

Francois Gouget : xmllite: A spelling fix in a comment.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: dcf146991babfaa6f852c4c6eaf51ac5c10af850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf146991babfaa6f852c4c6e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:56 2017 +0100 xmllite: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 460eeab..de61d13 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2466,7 +2466,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) if (!is_reader_pending(reader)) reader_clear_attrs(reader); - /* When moving from EndElement or empty element, pop its own namespace defitions */ + /* When moving from EndElement or empty element, pop its own namespace definitions */ if (nodetype == XmlNodeType_Element && reader->is_empty_element) reader_pop_ns_nodes(reader, &reader->empty_element); else if (nodetype == XmlNodeType_EndElement)

1 0

Francois Gouget : msi: Make reg_get_{multi}sz() static.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: 167de4270585f8110fe2c9ca789bfac7f417eb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=167de4270585f8110fe2c9ca7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:40:10 2017 +0100 msi: Make reg_get_{multi}sz() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ce29c26..1687a28 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3350,7 +3350,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCSTR szProduct, LPCSTR szFeature ) return MsiUseFeatureExA(szProduct, szFeature, 0, 0); } -WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) +static WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) { WCHAR *ret; DWORD len, type; @@ -3359,7 +3359,7 @@ WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) return ret; } -WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) +static WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) { WCHAR *ret; DWORD len, type;

1 0

Francois Gouget : msi/tests: A spelling fix in a variable name.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: f0a5b139804bc1baf40fbf84a18c9751a0941598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a5b139804bc1baf40fbf84a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:42:53 2017 +0100 msi/tests: A spelling fix in a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 748d25f..10ef84a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8294,7 +8294,7 @@ static void test_emptypackage(void) static void test_MsiGetProductProperty(void) { static const WCHAR prodcode_propW[] = {'P','r','o','d','u','c','t','C','o','d','e',0}; - static const WCHAR nonexistantW[] = {'I','D','o','n','t','E','x','i','s','t',0}; + static const WCHAR nonexistentW[] = {'I','D','o','n','t','E','x','i','s','t',0}; static const WCHAR newpropW[] = {'N','e','w','P','r','o','p','e','r','t','y',0}; static const WCHAR appleW[] = {'a','p','p','l','e',0}; static const WCHAR emptyW[] = {0}; @@ -8571,7 +8571,7 @@ static void test_MsiGetProductProperty(void) size = MAX_PATH; lstrcpyW(valW, appleW); - r = MsiGetProductPropertyW(hprod, nonexistantW, valW, &size); + r = MsiGetProductPropertyW(hprod, nonexistentW, valW, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpW(valW, emptyW), "Expected \"\", got %s\n", wine_dbgstr_w(valW)); ok(size == 0, "Expected 0, got %d\n", size);

1 0

Francois Gouget : quartz: A couple of spelling fixes in comments.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: ff36b5c816a37b28d334f9c55a1c1a57a154640d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff36b5c816a37b28d334f9c55… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:12 2017 +0100 quartz: A couple of spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e5671d2..1089de7 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -157,7 +157,7 @@ static void test_basic_video(void) ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); - /* test desination rectangle */ + /* test destination rectangle */ hr = IBasicVideo_GetDestinationPosition(pbv, NULL, NULL, NULL, NULL); ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, NULL, NULL); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 490d8d8..13f0d89 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -3028,7 +3028,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 TRACE("(%p/%p)->(...)\n", iface, This); - /* No AddRef taken here or the base VMR9 filter would never be destroied */ + /* No AddRef taken here or the base VMR9 filter would never be destroyed */ This->SurfaceAllocatorNotify = allocnotify; return S_OK; }

1 0

Francois Gouget : explorerframe: A spelling fix in a comment.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: 039691952e5c2dd9307ade4526100a1cbd26d86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=039691952e5c2dd9307ade452… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:45:01 2017 +0100 explorerframe: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 95b0a99..9ed392b 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -498,7 +498,7 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) INameSpaceTreeControl2_AddRef(&This->INameSpaceTreeControl2_iface); - /* Subclass the treeview to get the keybord events. */ + /* Subclass the treeview to get the keyboard events. */ This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)tv_wndproc); if(This->tv_oldwndproc)

1 0

Francois Gouget : dinput: Spelling and case fixes in comments.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: 49d42619fec5a2555c475e27bce94e8fe7ab2faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d42619fec5a2555c475e27b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:46:18 2017 +0100 dinput: Spelling and case fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index d3fede5..0fd16ed 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -633,9 +633,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( This->effect.u.periodic.magnitude = (tsp->dwMagnitude / 10) * 32; This->effect.u.periodic.offset = (tsp->lOffset / 10) * 32; - /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on linux */ + /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on Linux */ This->effect.u.periodic.phase = (tsp->dwPhase / 36) * 65; - /* dinput uses microseconds, linux uses miliseconds */ + /* dinput uses microseconds, Linux uses milliseconds */ if (tsp->dwPeriod <= 1000) This->effect.u.periodic.period = 1; else

1 0

Francois Gouget : regedit: Make output_writeconsole() static.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: 49c30d4b8ee1da2cfc02f7df87422ed62f7ed1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c30d4b8ee1da2cfc02f7df8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:38:15 2017 +0100 regedit: Make output_writeconsole() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 2 +- programs/regedit/regproc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 7b2ddaef..47fec63 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); -void output_writeconsole(const WCHAR *str, DWORD wlen) +static void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index bc46009..aff4bee 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,7 +24,6 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 -void output_writeconsole(const WCHAR *str, DWORD wlen); void __cdecl output_message(unsigned int id, ...); BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format);

1 0