January 2018 - Wine-commits

Thomas Faber : comctl32: Unset the toolbar' s hot item when deleting a button.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 4c5723296290d1db609a4c0c4078dcea6f828fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c5723296290d1db609a4c0c… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jan 19 11:44:43 2018 +0100 comctl32: Unset the toolbar's hot item when deleting a button. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 10 ++++++++++ dlls/comctl32/toolbar.c | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1dfd4b2..2c1b789 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -923,6 +923,16 @@ static void test_hotitem(void) ok(ret == 1, "TB_GETHOTITEM returned %ld, expected 1\n", ret); ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); + /* deleting a button unsets the hot item */ + ret = SendMessageA(hToolbar, TB_SETHOTITEM, 0, 0); + ok(ret == 1, "TB_SETHOTITEM returned %ld, expected 1\n", ret); + g_fReceivedHotItemChange = FALSE; + ret = SendMessageA(hToolbar, TB_DELETEBUTTON, 1, 0); + ok(ret == TRUE, "TB_DELETEBUTTON returned %ld, expected TRUE\n", ret); + ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0); + ok(ret == -1, "TB_GETHOTITEM returned %ld, expected -1\n", ret); + ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n"); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 8a03597..f9a2220 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3233,6 +3233,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[nIndex]); + infoPtr->nHotItem = -1; if (infoPtr->nNumButtons == 1) { TRACE(" simple delete\n"); free_string( infoPtr->buttons );

1 0

Akihiro Sagawa : kernel32: Return the list of module handles even if the last argument is null.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 844ae22fcfcca14ae66bc0f2458a0a2487d56de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=844ae22fcfcca14ae66bc0f2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 19 23:50:38 2018 +0900 kernel32: Return the list of module handles even if the last argument is null. Touhou Shinpiroku relies on this behaviour. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 14 ++++++++++---- dlls/psapi/tests/psapi_main.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d068f2a..b97c79b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1489,19 +1489,18 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, DWORD cb, DWORD *needed) { MODULE_ITERATOR iter; + DWORD size = 0; INT ret; if (!init_module_iterator(&iter, process)) return FALSE; - if ((cb && !lphModule) || !needed) + if (cb && !lphModule) { SetLastError(ERROR_NOACCESS); return FALSE; } - *needed = 0; - while ((ret = module_iterator_next(&iter)) > 0) { if (cb >= sizeof(HMODULE)) @@ -1509,8 +1508,15 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, *lphModule++ = iter.ldr_module.BaseAddress; cb -= sizeof(HMODULE); } - *needed += sizeof(HMODULE); + size += sizeof(HMODULE); + } + + if (!needed) + { + SetLastError(ERROR_NOACCESS); + return FALSE; } + *needed = size; return ret == 0; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 30059c5..8638d73 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -132,7 +132,7 @@ static void test_EnumProcessModules(void) ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); - todo_wine ok(hMod == GetModuleHandleA(NULL), + ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); SetLastError(0xdeadbeef);

1 0

Nikolay Sivov : urlmon/tests: Add some more PARSE_PATH_FROM_URL tests.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 45afe832565c5b52f20ba28a8025662805053737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45afe832565c5b52f20ba28a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 11 16:21:52 2018 +0300 urlmon/tests: Add some more PARSE_PATH_FROM_URL tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fd82c0b..a0e3f61 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7389,6 +7389,9 @@ static const uri_parse_test uri_parse_tests[] = { {"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE}, {"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE}, {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE}, + {"file:/c:/dir/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\dir\\test.mp3",S_OK}, + {"file:/c:/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK}, + {"file://c:\\test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK}, /* PARSE_URL_FROM_PATH tests. */ /* This function almost seems to useless (just returns the absolute uri). */ @@ -10566,11 +10569,11 @@ static void test_CoInternetParseIUri(void) { if(SUCCEEDED(hr)) { DWORD len = lstrlenA(test.property); ok(!strcmp_aw(test.property, result) || (test.property2 && !strcmp_aw(test.property2, result)), - "Error: Expected %s but got %s instead on uri_parse_tests[%d].\n", - test.property, wine_dbgstr_w(result), i); + "Error: Expected %s but got %s instead on uri_parse_tests[%d] - %s.\n", + test.property, wine_dbgstr_w(result), i, wine_dbgstr_w(uriW)); ok(len == result_len || (test.property2 && lstrlenA(test.property2) == result_len), - "Error: Expected %d, but got %d instead on uri_parse_tests[%d].\n", - len, result_len, i); + "Error: Expected %d, but got %d instead on uri_parse_tests[%d] - %s.\n", + len, result_len, i, wine_dbgstr_w(uriW)); } else { ok(!result_len, "Error: Expected 'result_len' to be 0, but was %d on uri_parse_tests[%d].\n",

1 0

Thomas Faber : usp10: Re-use script caches for the same font.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: fb44feb62fd8b49edd27921bc6bc3682d14c1254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb44feb62fd8b49edd27921b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jan 12 14:30:13 2018 +0100 usp10: Re-use script caches for the same font. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 69 +++++++++++++++++++++++--- dlls/usp10/usp10_internal.h | 5 ++ 3 files changed, 186 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb44feb62fd8b49edd27…

1 0

Alex Henrie : wintrust/tests: Initialize structure passed to WintrustLoadFunctionPointers.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 110db9fe1da03067533e454f0a527ae9f5563fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=110db9fe1da03067533e454f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 14 21:26:10 2018 -0700 wintrust/tests: Initialize structure passed to WintrustLoadFunctionPointers. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/register.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 42c5de6..32c8782 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -224,7 +224,7 @@ static void test_AddDefaultForUsage(void) static void test_LoadFunctionPointers(void) { BOOL ret; - CRYPT_PROVIDER_FUNCTIONS funcs; + CRYPT_PROVIDER_FUNCTIONS funcs = {0}; GUID action = WINTRUST_ACTION_GENERIC_VERIFY_V2; if (!pWintrustLoadFunctionPointers)

1 0

Alex Henrie : include: Correct definition of CRYPT_PROVUI_FUNCS.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: c11017771a3f0c7feabc5a7f5e4ffe7f173739fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c11017771a3f0c7feabc5a7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 14 21:26:11 2018 -0700 include: Correct definition of CRYPT_PROVUI_FUNCS. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wintrust.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wintrust.h b/include/wintrust.h index 20fb296..dcb432a 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -420,7 +420,7 @@ typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, typedef struct _CRYPT_PROVUI_FUNCS { DWORD cbStruct; - CRYPT_PROVUI_DATA psUIData; + CRYPT_PROVUI_DATA *psUIData; PFN_PROVUI_CALL pfnOnMoreInfoClick; PFN_PROVUI_CALL pfnOnMoreInfoClickDefault; PFN_PROVUI_CALL pfnOnAdvancedClick;

1 0

Alex Henrie : schannel/tests: Avoid dereferencing a null function pointer.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: cf629f7eddccad86e72181e73ed75e1a87b0427e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf629f7eddccad86e72181e7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 14 21:26:09 2018 -0700 schannel/tests: Avoid dereferencing a null function pointer. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/tests/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 4240dd7..fb350d5 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -213,6 +213,11 @@ static void testGetInfo(void) pTables = getNextSecPkgTable(pTables, Version); if (!pTables) return; + if (!pTables->GetInfo) + { + win_skip("GetInfo function missing\n"); + return; + } status = pTables->GetInfo(&PackageInfo); ok(status == STATUS_SUCCESS || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */

1 0

Thomas Faber : ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity).
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 42f742e1be8a4f3b26ed3d1a343f17fe55cbf322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42f742e1be8a4f3b26ed3d1a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jan 16 19:19:34 2018 +0100 ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity). Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 323ee68..b978438 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1453,8 +1453,11 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) if (progids->allocated == progids->num) { + WCHAR **new_progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, + 2 * progids->allocated * sizeof(WCHAR*)); + if (!new_progids) return FALSE; progids->allocated *= 2; - progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + progids->progids = new_progids; } if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE;

1 0

Huw Davies : winebrowser: Fix calling convention for wine_get_unix_file_name().
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: f4e75d780b9b662d6b0b7a845c3a1f1b8ae5dacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e75d780b9b662d6b0b7a84… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 18 09:44:41 2018 +0000 winebrowser: Fix calling convention for wine_get_unix_file_name(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 304ac14..b1c49e7 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winebrowser); -typedef LPSTR (*wine_get_unix_file_name_t)(LPCWSTR unixname); +typedef LPSTR (*CDECL wine_get_unix_file_name_t)(LPCWSTR unixname); static const WCHAR browser_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\',

1 0

Alexandre Julliard : ntdll: Export strnlen.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 7bcb214158a102e296931e8d2610e3fbff79437b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bcb214158a102e296931e8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 19:19:28 2018 +0100 ntdll: Export strnlen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/string.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 95581ec..097140f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1431,6 +1431,7 @@ @ cdecl -private strncat(str str long) NTDLL_strncat @ cdecl -private strncmp(str str long) NTDLL_strncmp @ cdecl -private strncpy(ptr str long) NTDLL_strncpy +@ cdecl -private strnlen(ptr long) NTDLL_strnlen @ cdecl -private strpbrk(str str) NTDLL_strpbrk @ cdecl -private strrchr(str long) NTDLL_strrchr @ cdecl -private strspn(str str) NTDLL_strspn diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index c349add..e0bf5be 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -164,6 +164,15 @@ char * __cdecl NTDLL_strncpy( char *dst, const char *src, size_t len ) /********************************************************************* + * strnlen (NTDLL.@) + */ +size_t __cdecl NTDLL_strnlen( const char *str, size_t len ) +{ + return strnlen( str, len ); +} + + +/********************************************************************* * strpbrk (NTDLL.@) */ char * __cdecl NTDLL_strpbrk( const char *str, const char *accept )

1 0