December 2016 - Wine-devel - list.winehq.org

Re: [PATCH] msvcrt: Pass wide char caption string to MessageBoxIndirectW.
by Nikolay Sivov 22 Dec '16

22 Dec '16

On Thu, 22 Dec 2016 14:20:26 -0700 Alex Henrie <alexhenrie24(a)gmail.com> wrote: > Cc: Piotr Caban <piotr(a)codeweavers.com> > > Fixes https://bugs.winehq.org/show_bug.cgi?id=42057 > > I figured this would be a good time to get rid of the misleading > Hungarian notation and move the string into the single function that > uses it. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/msvcrt/exit.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c > index 9ba0891806..3bfcd15967 100644 > --- a/dlls/msvcrt/exit.c > +++ b/dlls/msvcrt/exit.c > @@ -41,8 +41,6 @@ typedef struct MSVCRT__onexit_table_t > MSVCRT__onexit_t *_end; > } MSVCRT__onexit_table_t; > > -static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; > - > extern int MSVCRT_app_type; > extern MSVCRT_wchar_t *MSVCRT__wpgmptr; > > @@ -116,6 +114,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess > '%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', > 'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ', > 't','h','e',' ','W','i','n','e',' ','d','e','b','b','u','g','e','r','.','\n',0}; > + static const MSVCRT_wchar_t title[] = > + {'W','i','n','e',' ','C','+','+',' ','R','u','n','t','i','m','e',' ','L','i','b','r','a','r','y',0}; I think this should be WCHAR, because it will be used with regular API. > > MSGBOXPARAMSW msgbox; > MSVCRT_wchar_t text[2048]; > @@ -127,7 +127,7 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess > msgbox.hwndOwner = GetActiveWindow(); > msgbox.hInstance = 0; > msgbox.lpszText = (LPCWSTR)text; > - msgbox.lpszCaption = (LPCWSTR)szMsgBoxTitle; > + msgbox.lpszCaption = (LPCWSTR)title; Looks like these two casts could be removed. > msgbox.dwStyle = MB_OKCANCEL|MB_ICONERROR; > msgbox.lpszIcon = NULL; > msgbox.dwContextHelpId = 0;

1 0

Re: [PATCH 2/2] user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown and add tests
by Marvin 22 Dec '16

22 Dec '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=27468 Your paranoid android. === w7u (32 bit msg) === msg.c:9126: Test failed: did not get zero count as expected (1). msg.c:9129: Test failed: did not get one count as expected (2). msg.c:9133: Test failed: killing replaced timer did not work (2). msg.c:9146: Test failed: did not get expected count for minimum timeout (12 != ~100). === w7pro64 (64 bit msg) === msg.c:12258: Test failed: 56: ShowWindow(SW_SHOWNOACTIVATE): 5: in msg 0x0047 expecting wParam 0x8170 got 0x1803 msg.c:12258: Test failed: 56: ShowWindow(SW_SHOWNOACTIVATE): 6: the msg 0x0003 was expected, but got msg 0x0009 instead msg.c:12258: Test failed: 56: ShowWindow(SW_SHOWNOACTIVATE): 7: the msg 0x0005 was expected, but got msg 0x0047 instead msg.c:12258: Test failed: 56: ShowWindow(SW_SHOWNOACTIVATE): 13: the msg sequence is not complete: expected 0000 - actual 0003

2 1

Re: [PATCH 1/2] user32: Fix WM_NCPAINT for windows crossing screen boarders and add tests
by Marvin 22 Dec '16

22 Dec '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=27467 Your paranoid android. === w7pro64 (64 bit msg) === msg.c:12156: Test failed: 54: ShowWindow(SW_MINIMIZE): 4: in msg 0x0047 expecting wParam 0x8170 got 0x1803 msg.c:12156: Test failed: 54: ShowWindow(SW_MINIMIZE): 5: the msg 0x0003 was expected, but got msg 0x0047 instead msg.c:12156: Test failed: 54: ShowWindow(SW_MINIMIZE): 6: the msg 0x0005 was expected, but got msg 0x0003 instead msg.c:12156: Test failed: 54: ShowWindow(SW_MINIMIZE): 7: the msg sequence is not complete: expected 0000 - actual 0005

2 1

Re: webservices: allocate enough memory for WS_XML_TEXT_TYPE_DOUBLE (Valgrind) (try 2)
by Austin English 21 Dec '16

21 Dec '16

On Wed, Dec 14, 2016 at 4:45 PM, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. This shows in the tracker as assigned to Hans, but Hans signed off a week ago. -- -Austin GPG: 14FB D7EA A041 937B

3 3

Can't build crosstests
by Fabian Maurer 20 Dec '16

20 Dec '16

Hello, I'm trying to build the tests for windows, but I can't get it working anymore. I have mingw installed and it does work for cross-compiling with code-blocks, but wine says it's broken. The configure script fails with >checking for i686-w64-mingw32-gcc... i686-w64-mingw32-gcc >checking whether i686-w64-mingw32-gcc works... no An idea how to find out what's going wrong?

3 4

Re: user32/tests: Disable automatic shell restart during SetShellWindow tests.
by Marvin 20 Dec '16

20 Dec '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=27438 Your paranoid android. === w864 (32 bit win) === win.c:2305: Test failed: expected !100 win.c:2305: Test failed: expected !100 === w864 (64 bit win) === win.c:2305: Test failed: expected !100 win.c:2305: Test failed: expected !100

2 1

Re: [PATCH] gdiplus/tests: Test for initial properties of adjustable arrow caps
by Vincent Povirk 19 Dec '16

19 Dec '16

On Fri, Dec 16, 2016 at 6:21 AM, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + stat = GdipGetCustomLineCapBaseInset((GpCustomLineCap*)cap, &inset); > + ok(stat == Ok, "Unexpected return code, %d\n", stat); > + It isn't enough to reject the patch, but I'm curious why you don't test this value.

2 1

Re: shell32/tests: Skip SHFileOperationW tests if the user doesn't have admin rights.
by Nikolay Sivov 19 Dec '16

19 Dec '16

On 19.12.2016 13:38, Hans Leidekker wrote: > Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> > --- > dlls/shell32/tests/shlfileop.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c > index 0e502fc..776da98 100644 > --- a/dlls/shell32/tests/shlfileop.c > +++ b/dlls/shell32/tests/shlfileop.c > @@ -819,7 +819,7 @@ static void test_rename(void) > retval == DE_DIFFDIR || /* Vista */ > broken(retval == DE_OPCANCELLED) || /* Win9x */ > broken(retval == 65652), /* NT4 */ > - "Expected ERROR_CANCELLED or DE_DIFFDIR\n"); > + "Expected ERROR_CANCELLED or DE_DIFFDIR, got %u\n", retval); > ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); > > /* pFrom is empty */ > @@ -2516,6 +2516,11 @@ static void test_unicode(void) > skip("Unicode tests skipped on non-unicode system\n"); > return; > } > + if (GetLastError()==ERROR_ACCESS_DENIED) > + { > + skip("test needs admin rights\n"); > + return; > + } > CloseHandle(file); > > /* Try to delete a file with unicode filename */ > @@ -2574,6 +2579,7 @@ static void test_unicode(void) > ok(GetLastError() == ERROR_SUCCESS || > broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ > "Expected ERROR_SUCCESS, got %d\n", GetLastError()); > + DeleteFileW(UNICODE_PATH_TO); > > /* Check last error after a failed file operation. */ > DeleteFileW(UNICODE_PATH); Will it work if user temp directory was used instead of current directory or C: root?

2 1

Re: shell32/tests: Skip SHFileOperationW tests if the user doesn't have admin rights.
by Marvin 19 Dec '16

19 Dec '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=27406 Your paranoid android. === wvistau64 (32 bit shlfileop) === shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR, got 128 === wvistau64 (64 bit shlfileop) === shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR, got 128

2 1

Re: [PATCH] webservices: free the potentially allocated pointer (Coverity)
by Hans Leidekker 19 Dec '16

19 Dec '16

On Sat, 2016-12-17 at 12:48 +0100, Marcus Meissner wrote: > 1374356 Resource leak > > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/webservices/reader.c | 26 ++++++++++++++++++++++---- > 1 file changed, 22 insertions(+), 4 deletions(-) > > diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c > index d67c47a701..219683b2af 100644 > --- a/dlls/webservices/reader.c > +++ b/dlls/webservices/reader.c > @@ -4701,15 +4701,33 @@ static ULONG get_field_size( const WS_FIELD_DESCRIPTION *desc ) > > static HRESULT read_param( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, void *ret ) > { > - if (!ret && !(ret = ws_alloc_zero( heap, get_field_size(desc) ))) return WS_E_QUOTA_EXCEEDED; > - return read_type_struct_field( reader, desc, heap, ret, 0 ); > + HRESULT hr; > + VOID *xret = NULL; > + > + if (!ret) > + { > + if (!(xret = ws_alloc_zero( heap, get_field_size(desc) ))) return WS_E_QUOTA_EXCEEDED; > + ret = xret; > + } > + hr = read_type_struct_field( reader, desc, heap, ret, 0 ); > + ws_free( heap, xret); > + return hr; > } It's not a leak. The memory is allocated on the heap passed to this function and it will be released when the heap is destroyed. I guess Coverity doesn't see that.

2 1