February 2017 - Wine-commits

Francois Gouget : msxml3: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 135e98a428cf5e0a135b44a3bfb4d502e63b6411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=135e98a428cf5e0a135b44a3b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:21:31 2017 +0100 msxml3: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. 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/msxml3/msxml_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index b6d8b5d..74f6df5 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -164,24 +164,24 @@ const IID *get_riid_from_tid(enum tid_t tid) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void *heap_realloc_zero(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : dwrite: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: e99d22fdcc055be700f844a95aa4c924ecfa4c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99d22fdcc055be700f844a95… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:22:06 2017 +0100 dwrite: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. 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/dwrite/dwrite_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d91735d..36df1aa 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -30,24 +30,24 @@ static const DWRITE_MATRIX identity = 0.0f, 0.0f }; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void *heap_realloc_zero(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : urlmon: Add a __WINE_ALLOC_SIZE attribute to heap_alloc( ).
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 9c4ac7fd9cc98c5800ac23f9c060a3d840751372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4ac7fd9cc98c5800ac23f9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:20:55 2017 +0100 urlmon: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 4f31f2b..fd82c0b 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7433,12 +7433,13 @@ static inline LPWSTR a2w(LPCSTR str) { return ret; } -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline BOOL heap_free(void* mem) { +static inline BOOL heap_free(void *mem) +{ return HeapFree(GetProcessHeap(), 0, mem); }

1 0

Francois Gouget : jscript: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 1731629fd34696df9055abd74ee3a91c55dde979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1731629fd34696df9055abd74… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:21:48 2017 +0100 jscript: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2ca2437..756d7cf 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -54,19 +54,19 @@ void heap_pool_clear(heap_pool_t*) DECLSPEC_HIDDEN; void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; heap_pool_t *heap_pool_mark(heap_pool_t*) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : ieframe: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: f4993955c8ec20941bdf5103f4fe733023c78663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4993955c8ec20941bdf5103f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:21:55 2017 +0100 ieframe: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their formatting and parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index b586cc9..d1f1c5d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -331,19 +331,19 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Louis Lenders : httpapi: Add stub for HttpCreateServerSession.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: ef975efe647c190de3adf77d4aaa4649bd82228a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef975efe647c190de3adf77d4… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Feb 21 13:47:30 2017 +0100 httpapi: Add stub for HttpCreateServerSession. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 9 +++++++++ include/http.h | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 4d35c84..cdab28d 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -6,6 +6,7 @@ @ stub HttpCreateConfigGroup @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) +@ stdcall HttpCreateServerSession(long ptr long) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 5430f7e..1b35cd6 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -183,3 +183,12 @@ ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved ) FIXME( "(%p, %s, %p): stub!\n", handle, debugstr_w(url), reserved ); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * HttpCreateServerSession (HTTPAPI.@) + */ +ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved ) +{ + FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved ); + return ERROR_ACCESS_DENIED; +} diff --git a/include/http.h b/include/http.h index 8c2f21e..db8a3d4 100644 --- a/include/http.h +++ b/include/http.h @@ -50,11 +50,15 @@ typedef enum _HTTP_SERVICE_CONFIG_ID HttpServiceConfigMax } HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID; +typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID; +typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID; + ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); ULONG WINAPI HttpTerminate(ULONG,PVOID); ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); +ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);

1 0

Eric Kohl : comctl32: Update the tooltip rectangle when a tool button is hidden.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: b7cc44099af9556a90bcb6d22bc77f2f4539036c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7cc44099af9556a90bcb6d22… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Mon Feb 20 20:17:23 2017 +0100 comctl32: Update the tooltip rectangle when a tool button is hidden. Signed-off-by: Eric Kohl <eric.kohl(a)t-online.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 784745c..d908e41 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1690,6 +1690,7 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) if (btnPtr->fsState & TBSTATE_HIDDEN) { SetRectEmpty (&btnPtr->rect); + TOOLBAR_TooltipSetRect(infoPtr, btnPtr); continue; }

1 0

Francois Gouget : testbot/WineRunTask: TestLauncher' s fake test result lines are wrong.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: tools Branch: master Commit: d4f2487b1c185f2b866c906482db97ce05080468 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d4f2487b1c185f2b866c9064… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 21 18:02:31 2017 +0100 testbot/WineRunTask: TestLauncher's fake test result lines are wrong. TestLauncher uses the dll name instead of the test unit name on the fake 'tests skipped' and test summary lines it generates when a dll is missing. Accept the latter to avoid a 'missing test summary line' error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 21ad8e2..0b686f6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -509,7 +509,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) { my ($Pid, $Unit, $Todo, $Failures) = ($1, $2, $3, $4); - if ($Unit eq $CurrentUnit) + # TestLauncher uses the wrong name in its test summary line + if ($Unit eq $CurrentUnit or $Unit eq $CurrentDll) { $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures;

1 0

Francois Gouget : testbot/WineRunTask: Add the $TimedOut flag.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: tools Branch: master Commit: 5e631749e52953b520f4d4bfac88a9b938c9af0e URL: http://source.winehq.org/git/tools.git/?a=commit;h=5e631749e52953b520f4d4bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 21 10:29:11 2017 +0100 testbot/WineRunTask: Add the $TimedOut flag. The log analysis code depends on it to not issue redundant errors when the task timed out. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index c21aec0..21ad8e2 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -436,7 +436,7 @@ if (!$Pid) # my $NewStatus = 'completed'; -my ($TestFailures, $TAError, $PossibleCrash); +my ($TestFailures, $TimedOut, $TAError, $PossibleCrash); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { @@ -445,6 +445,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { LogTaskError("The test timed out\n"); $TestFailures = 1; + $TimedOut = 1; } else {

1 0

Alex Henrie : comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 690022c61b6dfc3af59bd3afdc53b33cc51201b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690022c61b6dfc3af59bd3afd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 20 00:06:12 2017 -0700 comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 ++------ dlls/comctl32/tests/listview.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 56e2563..c01d816 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7989,12 +7989,8 @@ static BOOL LISTVIEW_IsItemVisible(const LISTVIEW_INFO *infoPtr, INT nItem) static BOOL LISTVIEW_RedrawItems(const LISTVIEW_INFO *infoPtr, INT nFirst, INT nLast) { INT i; - - if (nLast < nFirst || min(nFirst, nLast) < 0 || - max(nFirst, nLast) >= infoPtr->nItemCount) - return FALSE; - - for (i = nFirst; i <= nLast; i++) + + for (i = max(nFirst, 0); i <= min(nLast, infoPtr->nItemCount - 1); i++) LISTVIEW_InvalidateItem(infoPtr, i); return TRUE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6d21b05..f497673 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5529,6 +5529,43 @@ static void test_LVM_SETITEMTEXT(void) DestroyWindow(hwnd); } +static void test_LVM_REDRAWITEMS(void) +{ + HWND list; + DWORD ret; + + list = create_listview_control(LVS_ICON); + ok(list != NULL, "failed to create listview window\n"); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 0); + expect(TRUE, ret); + + insert_item(list, 0); + + ret = SendMessageA(list, LVM_REDRAWITEMS, -1, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, -1); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 1); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 0, 2); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 1, 0); + expect(TRUE, ret); + + ret = SendMessageA(list, LVM_REDRAWITEMS, 2, 3); + expect(TRUE, ret); + + DestroyWindow(list); +} + static void test_imagelists(void) { HWND hwnd, header; @@ -5903,6 +5940,7 @@ START_TEST(listview) test_createdragimage(); test_dispinfo(); test_LVM_SETITEMTEXT(); + test_LVM_REDRAWITEMS(); test_imagelists(); test_deleteitem(); test_insertitem();

1 0