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

Re: Git branch naming (Re: wine-2.0.1-rc1 Available)

by Michael Stefaniuc

Hello Jens, On 04/04/2017 01:37 PM, Jens Reyer wrote: > Hi Michael and winehq git maintainers > > On 29.03.2017 23:05, Michael Stefaniuc wrote: >> I have pushed wine-2.0.1-rc1 (with tag) to >> https://github.com/mstefani/wine-stable >> https://static-winehq.rhcloud.com/stable/ > > I see you are re-using the branch name "stable", overwriting the > previous (1.8) branch. The same on winehq.org, where I see "stable" and > "oldstable". > > I suggest to use versioned names, maybe "stable-2.0" instead. (Anything > with some version would be fine, as long as it doesn't conflict with tag > names.) > > I see how re-using "stable" might be favorable when you are working with > the current stable release only, but as soon as you are working with > several stable releases it might get a bit confusing. E.g. in Debian we well, we do not intend to support more than one stable version at any time. Except when a new stable version is cut there will be a last update to the now oldstable. > will still be supporting 1.8 when 3.0 or 4.0 is out. Although I hope > there will be no need for changes then, it would still be nice to have a > branch available, where changes might be shared across distros even if > no further update is planned. Sure, if more distributions than Debian/Ubuntu will still use wine-1.8.7 (which I hope they won't) and there are common patches then yeah, I will create a stable-1.8 branch on my github tree. As a courtesy not for an official support. bye michael

April 4, 2017

Re: [v2 PATCH 2/3] odbccp32: Implement SQLRemoveTranslator/W

by Hugh McMaster

On Wed, Mar 22, 2017 at 10:06:18PM +0000, Alistair Leslie-Hughes wrote: > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index 7b2f020..d95a110 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -1229,20 +1229,75 @@ BOOL WINAPI SQLRemoveDSNFromIni(LPCSTR lpszDSN) > return FALSE; > } > > -BOOL WINAPI SQLRemoveTranslatorW(LPCWSTR lpszTranslator, LPDWORD lpdwUsageCount) > +BOOL WINAPI SQLRemoveTranslatorW(const WCHAR *translator, DWORD *usage_count) > { > + HKEY hkey; > + DWORD usagecount = 1; > + > clear_errors(); > - FIXME("%s %p\n", debugstr_w(lpszTranslator), lpdwUsageCount); > - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); > - return FALSE; > + TRACE("%s %p\n", debugstr_w(translator), usage_count); > + > + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) > + { > + HKEY hkeydriver; > + > + if (RegOpenKeyW(hkey, translator, &hkeydriver) == ERROR_SUCCESS) > + { > + DWORD size, type; > + DWORD count; > + > + size = sizeof(usagecount); > + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); > + TRACE("Usage count %d\n", count); It's a matter of taste, but is there a reason why you're mixing 16-bit functions (e.g. RegOpenKey) and functions defined for Vista and up (e.g. RegGetValue)? You should use RegOpenKeyEx and RegQueryValueEx. I realise this sort of mismatching occurs throughout odbccp32.c, but to my mind, it is wrong, and should be fixed file-wide in a separate patch. I don't know how strongly Huw cares about this though. Hugh

April 4, 2017

Git branch naming (Re: wine-2.0.1-rc1 Available)

by Jens Reyer

Hi Michael and winehq git maintainers On 29.03.2017 23:05, Michael Stefaniuc wrote: > I have pushed wine-2.0.1-rc1 (with tag) to > https://github.com/mstefani/wine-stable > https://static-winehq.rhcloud.com/stable/ I see you are re-using the branch name "stable", overwriting the previous (1.8) branch. The same on winehq.org, where I see "stable" and "oldstable". I suggest to use versioned names, maybe "stable-2.0" instead. (Anything with some version would be fine, as long as it doesn't conflict with tag names.) I see how re-using "stable" might be favorable when you are working with the current stable release only, but as soon as you are working with several stable releases it might get a bit confusing. E.g. in Debian we will still be supporting 1.8 when 3.0 or 4.0 is out. Although I hope there will be no need for changes then, it would still be nice to have a branch available, where changes might be shared across distros even if no further update is planned. Greets! jre

April 4, 2017

Re: [PATCH 1/4] d3dx9/tests: Add test implementation for ID3DXEffectStateManager interface.

by Paul Gofman

On 04/04/2017 01:37 PM, Paul Gofman wrote: > On 04/04/2017 01:20 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=29921 >> >> Your paranoid android. >> >> >> === build (build) === >> Patch failed to apply >> > I double checked the patches and could not find any problem with them. > What I did to check is downloaded (cloned) current wine git repository > to the new location (git clone git://source.winehq.org/git/wine.git) > took 'patch.diff' right from testbot > (https://testbot.winehq.org/GetFile.pl?JobKey=29921&StepKey=1) and > applied this patch, it applies cleanly. Am I missing something or can > it be some testbot problem? > > Thanks, > > Paul. > Maybe it can be related to this error seen in testbot job log: https://testbot.winehq.org/JobDetails.pl?Key=29906 (failure in the last update Wine to latest git)?

April 4, 2017

Re: [PATCH 1/4] d3dx9/tests: Add test implementation for ID3DXEffectStateManager interface.

by Paul Gofman

On 04/04/2017 01:20 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=29921 > > Your paranoid android. > > > === build (build) === > Patch failed to apply > I double checked the patches and could not find any problem with them. What I did to check is downloaded (cloned) current wine git repository to the new location (git clone git://source.winehq.org/git/wine.git) took 'patch.diff' right from testbot (https://testbot.winehq.org/GetFile.pl?JobKey=29921&StepKey=1) and applied this patch, it applies cleanly. Am I missing something or can it be some testbot problem? Thanks, Paul.

April 4, 2017

Re: [PATCH 4/4] d3dx9: Effect should preserve states regardless of state manager presence.

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=29924 Your paranoid android. === build (build) === Patch failed to apply

April 4, 2017

Re: [PATCH 3/4] d3dx9: Support effect state manager.

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=29923 Your paranoid android. === build (build) === Patch failed to apply

April 4, 2017

Re: [PATCH 2/4] d3dx9/tests: Add tests for effect state manager.

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=29922 Your paranoid android. === build (build) === Patch failed to apply

April 4, 2017

Re: [PATCH 1/4] d3dx9/tests: Add test implementation for ID3DXEffectStateManager interface.

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=29921 Your paranoid android. === build (build) === Patch failed to apply

April 4, 2017

Re: [PATCH 2/4] winex11: move XDestroyWindow() after free_gl_drawable() in set_win_format()

by Alexandre Julliard

Miklós Máté <mtmkls(a)gmail.com> writes: > @@ -1334,21 +1334,21 @@ static void free_gl_drawable( struct gl_drawable *gl ) > /*********************************************************************** > * create_gl_drawable > */ > -static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) > +static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl, struct x11drv_win_data *data ) > { > gl->drawable = 0; > > if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ > { > - struct x11drv_win_data *data = get_win_data( hwnd ); > - > if (data) > { > gl->type = DC_GL_WINDOW; > gl->window = create_client_window( data, gl->visual ); > if (gl->window) > + { > gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL ); > - release_win_data( data ); > + XSync( gdi_display, False ); Do you really need all the extra XSync calls? We try to avoid server round-trips as much as possible. -- Alexandre Julliard julliard(a)winehq.org

April 4, 2017