April 2017 - Wine-Devel - list.winehq.org

Wine native fps overlay

by CARLOS RODRIGUEZ

Hi Could be possible add native fps overlay, maybe can usefull for many apps and without forget steam overlay give performance issues in certain apps (steam overlay dont work since wine 2.6) Thanks

April 29, 2017

Re: [PATCH] user32: Do not call SendMessage() to show a window that is already visible.

by Kimmo Myllyvirta

On 04/29/2017 09:29 PM, Marvin wrote: > 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=30597 > > Your paranoid android. > > > === w7pro64 (32 bit msg) === > msg.c:5274: Test failed: RedrawWindow:show_popup_extreme_location: 12: the msg 0x001c was expected, but got msg 0x0085 instead That is not related to this patch, see e.g. https://testbot.winehq.org/JobDetails.pl?Key=30497#k103

April 29, 2017

Re: [PATCH] user32: Do not call SendMessage() to show a window that is already visible.

by Marvin

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=30597 Your paranoid android. === w7pro64 (32 bit msg) === msg.c:5274: Test failed: RedrawWindow:show_popup_extreme_location: 12: the msg 0x001c was expected, but got msg 0x0085 instead

April 29, 2017

Re: [PATCH] glu32: avoid assert side effect (Coverity)

by Ken Thomases

On Apr 29, 2017, at 12:38 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > > On 29.04.2017 20:34, Marcus Meissner wrote: >> CID 401313 >> >> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> >> --- >> dlls/glu32/sweep.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/dlls/glu32/sweep.c b/dlls/glu32/sweep.c >> index a909e2be33..1248e9f050 100644 >> --- a/dlls/glu32/sweep.c >> +++ b/dlls/glu32/sweep.c >> @@ -1287,7 +1287,8 @@ static void DoneEdgeDict( GLUtesselator *tess ) >> */ >> if( ! reg->sentinel ) { >> assert( reg->fixUpperEdge ); >> - assert( ++fixedEdges == 1 ); >> + ++fixedEdges; >> + assert( fixedEdges == 1 ); >> } >> assert( reg->windingNumber == 0 ); >> DeleteRegion( tess, reg ); >> > > This particular one has no side effects. Indeed, the proposed patch will break the build if NDEBUG is defined, because fixedEdges won't be declared. -Ken

April 29, 2017

Re: [PATCH] glu32: avoid assert side effect (Coverity)

by Nikolay Sivov

On 29.04.2017 20:34, Marcus Meissner wrote: > CID 401313 > > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/glu32/sweep.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/dlls/glu32/sweep.c b/dlls/glu32/sweep.c > index a909e2be33..1248e9f050 100644 > --- a/dlls/glu32/sweep.c > +++ b/dlls/glu32/sweep.c > @@ -1287,7 +1287,8 @@ static void DoneEdgeDict( GLUtesselator *tess ) > */ > if( ! reg->sentinel ) { > assert( reg->fixUpperEdge ); > - assert( ++fixedEdges == 1 ); > + ++fixedEdges; > + assert( fixedEdges == 1 ); > } > assert( reg->windingNumber == 0 ); > DeleteRegion( tess, reg ); > This particular one has no side effects. I don't know what's the plan for glu, maybe it's a better idea to report/fix anything the comes up in mesa, and then import again.

April 29, 2017

pulse/alsa option in wine cfg audio tab

by CARLOS RODRIGUEZ

Hi Seeking donat enikeev patch for add csmt option to graphics tab Could be possible add option for select which audio driver can be used aka alsa o pulse in winecfg audio tab ? Because various apps still needed alsa case tales of zestiria, alan wake and many others Thanks

April 29, 2017

Re: [4/6] secur32: Return PRF algorithm value when using GCM. (resend)

by Akihiro Sagawa

On Fri, 28 Apr 2017 15:06:15 +0200, Sebastian Lackner wrote: > On 28.04.2017 14:58, Bruno Jesus wrote: > > On Fri, Apr 28, 2017 at 5:21 AM, Jacek Caban <jacek(a)codeweavers.com> wrote: > >> On 4/28/17 2:19 AM, Bruno Jesus wrote: > >> > >>> On Thu, Apr 27, 2017 at 8:27 PM, Michael Müller <michael(a)fds-team.de> > >>> wrote: > >>>> > >>>> This patch broke the compilation on Debian Wheezy and Ubuntu Trusty: > >>>> > >>>> schannel_gnutls.c: In function schannel_get_mac_algid: > >>>> schannel_gnutls.c:329:10: error: ‘GNUTLS_MAC_AEAD undeclared (first use > >>>> in this function) > >>>> schannel_gnutls.c:329:10: note: each undeclared identifier is reported > >>>> only once for each function it appears in > >>>> > >>>> Build overview: https://dev.wine-staging.com/builder/group/60/ (Click > >>>> Downloads for build logs) > >>>> Debian Wheezy build log: > >>>> https://builds.wine-staging.com/2017-04-27-21-23-02-job-10597/build.log > >>> > >>> PC-BSD 9 broke too, same error. > >> > >> > >> Please verify that the attached patch fixes the problem. > > > > Yes, it fixes the problem. > > > > Thanks, > > Bruno > > > > > > It also fixes the problem on Debian Wheezy, thanks! > See: https://dev.wine-staging.com/builder/group/61/ I appreciate reporting and quick fixing for the issue. I'll be more careful about an older version of GnuTLS. And sorry for delaied response. Regards, Akihiro Sagawa

April 29, 2017

Re: [PATCH 4/4] dmloader/tests: Add some IDirectMusicLoader directory tests.

by Michael Stefaniuc

On 04/28/2017 02:57 PM, Sebastian Lackner wrote: > On 27.04.2017 19:15, Michael Stefaniuc wrote: >> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> >> --- >> dlls/dmloader/tests/loader.c | 41 +++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 41 insertions(+) >> > > Your patch introduced a bunch of test failures here: > > loader.c:69: Test succeeded inside todo block: SetSearchDirectory failed with 0 > loader.c:71: Test failed: Second SetSearchDirectory failed with 0 > loader.c:73: Test failed: SetSearchDirectory failed with 0x1 Yeah, IDirectMusicLoader_SetSearchDirectory() in Wine seems very "finicky". And I wanted to avoid looking more at it but meh... bye michael

April 28, 2017

Re: Review | endproc.c: Implement ProcessPage_OnEndProcessTree

by Bruno Jesus

On Thu, Apr 27, 2017 at 9:11 AM, Akarsha Sehwag <akarsha15010(a)iiitd.ac.in> wrote: > ... > > I didn't understand the function of the flags in HeapAlloc() and > HeapReAlloc(). I read the function RtlAllocateHeap() but I am unable to > figure out which flag to use out of HEAP_GENERATE_EXCEPTIONS, > HEAP_NO_SERIALIZE and HEAP_ZERO_MEMORY. When no flags are required you can always use 0. > diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c > index 89c2d7b..c890f06 100644 > --- a/programs/taskmgr/endproc.c > +++ b/programs/taskmgr/endproc.c > @@ -31,17 +31,42 @@ > #include "wine/unicode.h" > #include "taskmgr.h" > #include "perfdata.h" > +#include "tlhelp32.h" > + > Please avoid double empty line. > static WCHAR wszWarnMsg[511]; > static WCHAR wszWarnTitle[255]; > static WCHAR wszUnable2Terminate[255]; > > +typedef struct process_list { > + DWORD *pid; /*dynamic array to store the process IDs*/ > + SIZE_T count; /*index to maintain the last entry of the array;*/ > + SIZE_T size; /*the current size of the pid array*/ > +} process_list; Please use a space between /* */ and the comments, but anyway the struct above is pretty self explanatory so there is no need to comment each field. > + > static void load_message_strings(void) > { > LoadStringW(hInst, IDS_TERMINATE_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); > LoadStringW(hInst, IDS_TERMINATE_UNABLE2TERMINATE, wszUnable2Terminate, sizeof(wszUnable2Terminate)/sizeof(WCHAR)); > LoadStringW(hInst, IDS_WARNING_TITLE, wszWarnTitle, sizeof(wszWarnTitle)/sizeof(WCHAR)); > } > + > +static void kill_process(HANDLE hProcess, WCHAR *wstrErrorText) > +{ > + if (!hProcess) > + { > + GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > + MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > + return; > + } > + > + if (!TerminateProcess(hProcess, 0)) > + { > + GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > + MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > + } > +} > + I known this was copy pasted from original code but please fix the missing space for ",wszUnable2Terminate". > void ProcessPage_OnEndProcess(void) > { > @@ -77,22 +102,71 @@ void ProcessPage_OnEndProcess(void) > > hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); > > - if (!hProcess) > - { > - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > - MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > - return; > + > + kill_process(hProcess, wstrErrorText); > + > + CloseHandle(hProcess); > +} > + > + Double empty line. > +static INT init_process_list(process_list *list) { > + list->size = 4; /*initialise size with 4. Will increase if necessary.*/ > + list->pid = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->size * sizeof(*(list->pid))); > + list->count = 0; > + > + if(list->pid == NULL) > + return 0; > + > + return 1; > +} Just change the HEAP_ZERO_MEMORY for 0. There is no need for extra parenthesis at "sizeof(*(list->pid))", so "sizeof(*list->pid)". Make the function BOOL and "return list->pid != NULL" instead of double return 0/1. > + > +static INT process_list_append(process_list *list, DWORD id) { > + if(list->count == list->size){ > + list->size *= 2; > + list->pid = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->pid, list->size * sizeof(*(list->pid))); > + if(!list->pid) > + return 0; > } The rest of the code uses { in the next line below the if, please do the same here. And add the missing space from "if(" to "if (". You need an intermediate variable to store the results of HeapReAlloc otherwise you will lose the original pointer in case of error. > + list->pid[list->count] = id; > + list->count += 1; > + return 1; > +} Make the function BOOL. Minor style nitpick: use list->count++. You can also merge both lines: list->pid[list->count++] = id; > > - if (!TerminateProcess(hProcess, 0)) > +static void free_process_list(process_list *list) { > + HeapFree(GetProcessHeap(), 0, list->pid); > +} > + > + Double empty line. > +static void enum_process_children(HANDLE snapshot, process_list *list, DWORD pid) { > + PROCESSENTRY32 entry; > + > + SIZE_T start, end, i; "{" in the next line. Remove the empty line between variable declarations. > + > + start = list->count; > + > + entry.dwSize = sizeof(entry); > + > + if(!Process32First(snapshot, &entry)) > + return; > + > + do > + { > + if(entry.th32ParentProcessID == pid) > + { > + if(!process_list_append(list, entry.th32ProcessID)) > + return; > + } > + } while (Process32Next(snapshot, &entry)); > + > + end = list->count; > + > + for(i = start; i < end; ++i) > { > - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > - MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > + enum_process_children(snapshot, list, list->pid[i]); > } > - > - CloseHandle(hProcess); > } > > + Double empty line. > void ProcessPage_OnEndProcessTree(void) > { > LVITEMW lvitem; > @@ -100,6 +174,9 @@ void ProcessPage_OnEndProcessTree(void) > DWORD dwProcessId; > HANDLE hProcess; > WCHAR wstrErrorText[256]; > + process_list list; > + SIZE_T i; > + HANDLE snapshot; > > load_message_strings(); > > @@ -125,20 +202,32 @@ void ProcessPage_OnEndProcessTree(void) > if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES) > return; > > - hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); > > - if (!hProcess) > + if(!init_process_list(&list)) > + return; > + > + if(!process_list_append(&list, dwProcessId)) > + return; You are not freeing the list in case of error here. > + > + snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); > + > + if(snapshot == INVALID_HANDLE_VALUE) > { > - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > - MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > + free_process_list(&list); > return; > } > > - if (!TerminateProcess(hProcess, 0)) > - { > - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > - MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > + enum_process_children(snapshot, &list, dwProcessId); > + > + CloseHandle(snapshot); > + > + for(i = 0; i < list.count; ++i) { > + hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, list.pid[i]); > + > + kill_process(hProcess, wstrErrorText); > + > + CloseHandle(hProcess); > } "{" in the next line, no need for empty lines between functions. > > - CloseHandle(hProcess); > + free_process_list(&list); > } > Watch out for trailing space issues: /home/bruno/Downloads/diff.txt:9: trailing whitespace. #include "tlhelp32.h" /home/bruno/Downloads/diff.txt:28: trailing whitespace. /home/bruno/Downloads/diff.txt:43: trailing whitespace. } /home/bruno/Downloads/diff.txt:57: trailing whitespace. /home/bruno/Downloads/diff.txt:100: trailing whitespace. entry.dwSize = sizeof(entry); warning: squelched 5 whitespace errors warning: 10 lines add whitespace errors. Best wishes, Bruno

April 28, 2017

Re: [4/6] secur32: Return PRF algorithm value when using GCM. (resend)

by Sebastian Lackner

On 28.04.2017 14:58, Bruno Jesus wrote: > On Fri, Apr 28, 2017 at 5:21 AM, Jacek Caban <jacek(a)codeweavers.com> wrote: >> On 4/28/17 2:19 AM, Bruno Jesus wrote: >> >>> On Thu, Apr 27, 2017 at 8:27 PM, Michael Müller <michael(a)fds-team.de> >>> wrote: >>>> >>>> This patch broke the compilation on Debian Wheezy and Ubuntu Trusty: >>>> >>>> schannel_gnutls.c: In function schannel_get_mac_algid: >>>> schannel_gnutls.c:329:10: error: ‘GNUTLS_MAC_AEAD undeclared (first use >>>> in this function) >>>> schannel_gnutls.c:329:10: note: each undeclared identifier is reported >>>> only once for each function it appears in >>>> >>>> Build overview: https://dev.wine-staging.com/builder/group/60/ (Click >>>> Downloads for build logs) >>>> Debian Wheezy build log: >>>> https://builds.wine-staging.com/2017-04-27-21-23-02-job-10597/build.log >>> >>> PC-BSD 9 broke too, same error. >> >> >> Please verify that the attached patch fixes the problem. > > Yes, it fixes the problem. > > Thanks, > Bruno > > It also fixes the problem on Debian Wheezy, thanks! See: https://dev.wine-staging.com/builder/group/61/ Please note that you can also start test builds yourself after registering an account and requesting build server access. Best regards, Sebastian

April 28, 2017