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

Wine native fps overlay
by CARLOS RODRIGUEZ 04 May '17

04 May '17

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

3 2

pulse/alsa option in wine cfg audio tab
by CARLOS RODRIGUEZ 04 May '17

04 May '17

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

2 1

Re: [PATCH] user32: Do not call SendMessage() to show a window that is already visible.
by Dmitry Timoshkov 01 May '17

01 May '17

Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> wrote: > diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c > index c2b35ec..64fdfe0 100644 > --- a/dlls/user32/winpos.c > +++ b/dlls/user32/winpos.c > @@ -1239,6 +1239,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) > if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) > return FALSE; > > + if ((cmd == SW_SHOW) && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) > + return TRUE; > + > return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); > } Please have a look at the show_window() implementation and try to cover all cases that trigger SWP_SHOWWINDOW flag passed to SetWindowPos() in order to actually show a window. In fact it's only SW_HIDE that leads to that, so perhaps just adding an 'else' to the SW_HIDE case is enough? -- Dmitry.

2 1

Wine native fps overlay
by CARLOS RODRIGUEZ 01 May '17

01 May '17

Hi Yes +fps option works but not all time, many times wine gives priority to some errors messages than fps counter However native fps overlay will be better because overlay appears independent wine message errors Without forget will be better for new users but need to some option for enable in winecfg Thanks

2 1

Re: version: Fix error in win 9x mode when a file was not found in GetFileVersionInfoSize.
by Nikolay Sivov 30 Apr '17

30 Apr '17

On 28.04.2017 18:03, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > Signed-off-by: Michael Müller <michael(a)fds-team.de> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/version/version.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/dlls/version/version.c b/dlls/version/version.c > index ed060c82b6..3ab53026e8 100644 > --- a/dlls/version/version.c > +++ b/dlls/version/version.c > @@ -705,7 +705,12 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h > return (len * 2) + 4; > > default: > - SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND ); > + if (lzfd == HFILE_ERROR) > + SetLastError(ofs.nErrCode); > + else if (GetVersion() & 0x80000000) > + SetLastError(ERROR_FILE_NOT_FOUND); > + else > + SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); > return 0; > } > } > What depends on this? Is this function actually exported on Win9x? If not this fixup should happen in actual affected export I think.

2 1

Re: [PATCH v2] taskmgr/endproc.c: Implement ProcessPage_OnEndProcessTree()
by Bruno Jesus 30 Apr '17

30 Apr '17

Hi, just a variable type change and minor style suggestions, some you can accept or ignore. > ... > > +static BOOL process_list_append(process_list *list, DWORD id) > +{ > + INT *temp; > + if (list->count == list->size) > { > - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > - MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > - return; > + list->size *= 2; > + temp = HeapReAlloc(GetProcessHeap(), 0, list->pid, list->size * sizeof(*list->pid)); > + if(!temp) > + return FALSE; > + > + list->pid = temp; > } > + list->pid[list->count++] = id; > + return TRUE; > +} Please use an empty line to separate variable declaration from code. Change "INT *temp" to "DWORD *temp" so it matches the same type from list->pid. You can also reduce the scope of the temp variable. There are 4 uses of "if(", please change to "if (". > - if (!TerminateProcess(hProcess, 0)) > +static void free_process_list(process_list *list) > +{ > + HeapFree(GetProcessHeap(), 0, list->pid); > +} > + > +static void enum_process_children(HANDLE snapshot, process_list *list, DWORD pid) > +{ > + PROCESSENTRY32 entry; > + SIZE_T start, end, i; > + > + start = list->count; > + entry.dwSize = sizeof(entry); > + > + if(!Process32First(snapshot, &entry)) > + return; > + > + do > + { > + if(entry.th32ParentProcessID == pid) > + { > + if(!process_list_append(list, entry.th32ProcessID)) > + { > + free_process_list(list); > + 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]); > } You can drop the { } since there is a single line now, but it is just a suggestion. Other style suggestion is to merge the end attribution inside the for like "for (i = start, end = list-> count; ...". > - > - CloseHandle(hProcess); > } > > void ProcessPage_OnEndProcessTree(void) > @@ -100,11 +171,14 @@ void ProcessPage_OnEndProcessTree(void) > DWORD dwProcessId; > HANDLE hProcess; > WCHAR wstrErrorText[256]; > + process_list list; > + SIZE_T i; > + HANDLE snapshot; > > load_message_strings(); > > Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); > - for (Index=0; Index<Count; Index++) > + for (Index = 0; Index < Count; Index++) > { > lvitem.mask = LVIF_STATE; > lvitem.stateMask = LVIS_SELECTED; > @@ -116,7 +190,6 @@ void ProcessPage_OnEndProcessTree(void) > if (lvitem.state & LVIS_SELECTED) > break; > } > - > Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0); Please don't remove the empty line to separate the code from the "for" block. > ... On Sat, Apr 29, 2017 at 7:08 PM, Akarsha Sehwag <akarsha15010(a)iiitd.ac.in> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=39640 > > Implemented ProcessPage_OnEndProcessTree(). It now kills all the child processes along with the specified process. > > Signed-off-by: Akarsha Sehwag <akarsha15010(a)iiitd.ac.in> > --- > programs/taskmgr/endproc.c | 125 +++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 105 insertions(+), 20 deletions(-) > > diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c > index 89c2d7b..60df0d7 100644 > --- a/programs/taskmgr/endproc.c > +++ b/programs/taskmgr/endproc.c > @@ -31,11 +31,18 @@ > #include "wine/unicode.h" > #include "taskmgr.h" > #include "perfdata.h" > +#include "tlhelp32.h" > > static WCHAR wszWarnMsg[511]; > static WCHAR wszWarnTitle[255]; > static WCHAR wszUnable2Terminate[255]; > > +typedef struct process_list { > + DWORD *pid; > + SIZE_T count; /* index to maintain the last entry of the array */ > + SIZE_T size; > +} process_list; > + > static void load_message_strings(void) > { > LoadStringW(hInst, IDS_TERMINATE_MESSAGE, wszWarnMsg, sizeof(wszWarnMsg)/sizeof(WCHAR)); > @@ -43,6 +50,22 @@ static void load_message_strings(void) > 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); > + } > +} > + > void ProcessPage_OnEndProcess(void) > { > LVITEMW lvitem; > @@ -54,7 +77,7 @@ void ProcessPage_OnEndProcess(void) > load_message_strings(); > > Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); > - for (Index=0; Index<Count; Index++) > + for (Index=0; Index < Count; Index++) > { > lvitem.mask = LVIF_STATE; > lvitem.stateMask = LVIS_SELECTED; > @@ -77,20 +100,68 @@ void ProcessPage_OnEndProcess(void) > > hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); > > - if (!hProcess) > + kill_process(hProcess, wstrErrorText); > + CloseHandle(hProcess); > +} > + > +static BOOL init_process_list(process_list *list) > +{ > + list->size = 4; /* initialise size with 4. Will increase if necessary */ > + list->pid = HeapAlloc(GetProcessHeap(), 0, list->size * sizeof(*list->pid)); > + list->count = 0; > + > + return list->pid != NULL; > +} > + > +static BOOL process_list_append(process_list *list, DWORD id) > +{ > + INT *temp; > + if (list->count == list->size) > { > - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > - MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > - return; > + list->size *= 2; > + temp = HeapReAlloc(GetProcessHeap(), 0, list->pid, list->size * sizeof(*list->pid)); > + if(!temp) > + return FALSE; > + > + list->pid = temp; > } > + list->pid[list->count++] = id; > + return TRUE; > +} > > - if (!TerminateProcess(hProcess, 0)) > +static void free_process_list(process_list *list) > +{ > + HeapFree(GetProcessHeap(), 0, list->pid); > +} > + > +static void enum_process_children(HANDLE snapshot, process_list *list, DWORD pid) > +{ > + PROCESSENTRY32 entry; > + SIZE_T start, end, i; > + > + start = list->count; > + entry.dwSize = sizeof(entry); > + > + if(!Process32First(snapshot, &entry)) > + return; > + > + do > + { > + if(entry.th32ParentProcessID == pid) > + { > + if(!process_list_append(list, entry.th32ProcessID)) > + { > + free_process_list(list); > + 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); > } > > void ProcessPage_OnEndProcessTree(void) > @@ -100,11 +171,14 @@ void ProcessPage_OnEndProcessTree(void) > DWORD dwProcessId; > HANDLE hProcess; > WCHAR wstrErrorText[256]; > + process_list list; > + SIZE_T i; > + HANDLE snapshot; > > load_message_strings(); > > Count = SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0); > - for (Index=0; Index<Count; Index++) > + for (Index = 0; Index < Count; Index++) > { > lvitem.mask = LVIF_STATE; > lvitem.stateMask = LVIS_SELECTED; > @@ -116,7 +190,6 @@ void ProcessPage_OnEndProcessTree(void) > if (lvitem.state & LVIS_SELECTED) > break; > } > - > Count = SendMessageW(hProcessPageListCtrl, LVM_GETSELECTEDCOUNT, 0, 0); > dwProcessId = PerfDataGetProcessId(Index); > if ((Count != 1) || (dwProcessId == 0)) > @@ -125,20 +198,32 @@ void ProcessPage_OnEndProcessTree(void) > if (MessageBoxW(hMainWnd, wszWarnMsg, wszWarnTitle, MB_YESNO|MB_ICONWARNING) != IDYES) > return; > > - hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); > + if (!init_process_list(&list)) > + return; > > - if (!hProcess) > + if (!process_list_append(&list, dwProcessId)) > { > - GetLastErrorText(wstrErrorText, sizeof(wstrErrorText)/sizeof(WCHAR)); > - MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); > + free_process_list(&list); > return; > } > > - if (!TerminateProcess(hProcess, 0)) > + 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; > } > + enum_process_children(snapshot, &list, dwProcessId); > + > + CloseHandle(snapshot); > > - CloseHandle(hProcess); > + for (i = 0; i < list.count; ++i) > + { > + hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, list.pid[i]); > + > + kill_process(hProcess, wstrErrorText); > + CloseHandle(hProcess); > + } > + free_process_list(&list); > } > -- > 2.9.3 > > >

1 0

Re: [v2 PATCH 1/4] mfplat: Implement MFTRegister
by Nikolay Sivov 30 Apr '17

30 Apr '17

On 30.04.2017 6:29, Alistair Leslie-Hughes wrote: > + for (i = 0; i < cinput; i++) > + { > + memcpy(&types[2 * i], &input_types[i].guidMajorType, sizeof(GUID)); > + memcpy(&types[2 * i + 1], &input_types[i].guidSubtype, sizeof(GUID)); > + } This probably could be simplified even more, you can use MFT_REGISTER_TYPE_INFO for 'types' (that would make it 'type' actually), and do types[i] = input_types[i];, or even copy whole input_types array at once. Same applies to MFTEnum().

1 0

Re: [v2 PATCH 3/4] mfplat: Implement MFTEnum.
by Nikolay Sivov 30 Apr '17

30 Apr '17

On 30.04.2017 6:29, Alistair Leslie-Hughes wrote: > + for (i = 0; i < size / sizeof(GUID); i += 2) > + { > + if (!IsEqualGUID(&guids[i], &type->guidMajorType) && > + !IsEqualGUID(&guids[i+1], &type->guidSubtype)) > + { > + ret = TRUE; > + break; > + } > + } This is confusing. Shouldn't it look for a match?

1 0

Re: [PATCH] user32: Do not call SendMessage() to show a window that is already visible.
by Marvin 30 Apr '17

30 Apr '17

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

2 1

Re: [PATCH] glu32: avoid assert side effect (Coverity)
by Nikolay Sivov 29 Apr '17

29 Apr '17

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.

2 1