July 2013 - Wine-Devel - list.winehq.org

Re: [PATCH] winemac.drv: Also return the number of pixel formats if the caller didn't supply a PIXELFORMATDESCRIPTOR.
by Ken Thomases July 24, 2013

July 24, 2013

On Jul 23, 2013, at 10:26 PM, Charles Davis wrote: > This is akin to what glxdrv already does, and apparently what Windows > does. It allows the GLView sample from the OpenGL SuperBible to > correctly enumerate pixel formats with the Mac driver. > --- > dlls/winemac.drv/opengl.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c > index 0922371..fb294d1 100644 > --- a/dlls/winemac.drv/opengl.c > +++ b/dlls/winemac.drv/opengl.c > @@ -3281,7 +3281,7 @@ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRI > > TRACE("hdc %p fmt %d size %u descr %p\n", hdc, fmt, size, descr); > > - if (fmt <= 0 || fmt > ret) return ret; > + if (fmt <= 0 || fmt > ret || !descr) return ret; > if (size < sizeof(*descr)) return 0; > > pf = &pixel_formats[fmt - 1]; > -- > 1.7.5.4 Looks good to me. Thanks! -Ken

1 0

Re: [PATCH] winemac.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string.
by Ken Thomases July 24, 2013

July 24, 2013

Hi, On Jul 23, 2013, at 10:26 PM, Charles Davis wrote: > @@ -1226,8 +1227,10 @@ static BOOL init_gl_info(void) > gl_info.glVersion = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); > strcpy(gl_info.glVersion, str); > str = (const char*)opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); > - gl_info.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); > + gl_info.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str) + > + sizeof(" WGL_EXT_extensions_string WGL_EXT_swap_control")); > strcpy(gl_info.glExtensions, str); > + strcat(gl_info.glExtensions, " WGL_EXT_extensions_string WGL_EXT_swap_control"); As a minor nitpick, I would prefer to avoid that duplicated string literal. Otherwise, looks good to me. Cheers, Ken

1 0

Re: [PATCH 4/5] scrrun: Add IFileSystem3::GetTempName implementation
by Alexandre Julliard July 24, 2013

July 24, 2013

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -174,6 +174,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) > case DLL_PROCESS_ATTACH: > DisableThreadLibraryCalls( hinst ); > scrrun_instance = hinst; > + srand(GetTickCount()); You don't want to do that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: po: Update English (US) resource
by Francois Gouget July 24, 2013

July 24, 2013

On Mon, 22 Jul 2013, Ken Sharp wrote: > Logon/Log on as with the British/neutral patch. > > msgid "Can't logon with inter-domain trust account.\n" > -msgstr "Can't logon with inter-domain trust account.\n" > +msgstr "Can't log on with inter-domain trust account.\n" [...] I think these fixes should really be applied to the source winerror.mc file instead. If I remember correctly en_US.po is just a dummy translation where msgid and msgstr strings should be identical (there might (with maybe one or two exceptions for things like um -> µm). -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Be careful of reading health books, you might die of a misprint. -- Mark Twain

2 1

Re: [PATCH 1/3] msvcrt: Fix _mktemp implementation
by Marvin July 24, 2013

July 24, 2013

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 http://testbot.winehq.org/JobDetails.pl?Key=26413 Your paranoid android. === W2KPROSP4 (32 bit file) === file: unhandled exception c0000005 at 7801B5A7 === WXPPROSP2 (32 bit file) === file: unhandled exception c0000005 at 77C2F1C3 === W2K3R2SESP2 (32 bit file) === file: unhandled exception c0000005 at 77BC00A3 === WXPX64 (64 bit file) === Timeout

1 0

Re: [PATCH 1/3] d3dx9: Fix initialization of D3DXPC_OBJECTs.
by Rico Schüller July 23, 2013

July 23, 2013

On 23.07.2013 11:46, Rico Schüller wrote: > --- > dlls/d3dx9_36/effect.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > > > > These may not apply correctly. Sorry for the noise. I'll resend a new version. Cheers Rico

1 0

Re: [docs] "sgml" is not a valid output format
by Francois Gouget July 23, 2013

July 23, 2013

On Tue, 23 Jul 2013, Frédéric Delanoy wrote: [...] > -ALLFORMATS = html pdf sgml ps txt > +ALLFORMATS = html pdf ps txt 'make sgml' can be used to generate the translated SGML source files for our many documentation translations. So I don't think this patch should be applied. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ The last time religion ruled, it was called the dark ages.

1 0

Re: [docs] "sgml" is not a valid output format
by Frédéric Delanoy July 23, 2013

July 23, 2013

On Tue, Jul 23, 2013 at 5:26 PM, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > --- > Make.rules.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Make.rules.in b/Make.rules.in > index fda8e81..d326247 100644 > --- a/Make.rules.in > +++ b/Make.rules.in > @@ -100,7 +100,7 @@ dummy: > > # Manual Dependencies > > -ALLFORMATS = html pdf sgml ps txt > +ALLFORMATS = html pdf ps txt Please discard this patch ; it seems to be used in the translated guides to generate sgml from english version+po file

1 0

Re: [1/5] oledb32: Stub for IRowPosition
by Marvin July 23, 2013

July 23, 2013

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 http://testbot.winehq.org/JobDetails.pl?Key=26406 Your paranoid android. === WINEBUILD (build) === Make failed

2 1

Re: [PATCH 1/2] wined3d: Implement special fog behavior for orthogonal projection matrices.
by Henri Verbeet July 23, 2013

July 23, 2013

On 22 July 2013 20:24, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -3614,10 +3614,19 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct > & WINED3D_FFP_LIGHT_TYPE_MASK) << WINED3D_FFP_LIGHT_TYPE_SHIFT(i); > } > > + settings->ortho_fog = 0; > if (!state->render_states[WINED3D_RS_FOGENABLE]) > settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; > else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) > + { > settings->fog_mode = WINED3D_FFP_VS_FOG_DEPTH; > + > + if (state->transforms[WINED3D_TS_PROJECTION].u.m[0][3] == 0.0f > + && state->transforms[WINED3D_TS_PROJECTION].u.m[1][3] == 0.0f > + && state->transforms[WINED3D_TS_PROJECTION].u.m[2][3] == 0.0f > + && state->transforms[WINED3D_TS_PROJECTION].u.m[3][3] == 1.0f) > + settings->ortho_fog = 1; > + } I'm going to guess "No, because the projection matrix is ignored.", but does this "feature" apply to transformed vertices as well?

1 0

Re: [PATCH 2/2] include/ddk: add usbioctl.h
by Nikolay Sivov July 22, 2013

July 22, 2013

On 7/22/2013 22:38, Damjan Jovanovic wrote: > Changelog: > * add usbioctl.h > > Damjan Jovanovic Hi, Damjan. You forgot patches.

3 2

Re: appwiz: Correct Wine Mono installer messages
by Alexandre Julliard July 22, 2013

July 22, 2013

Ken Sharp <kennybobs(a)o2.co.uk> writes: > Where the correction is obvious I have done so, but where a full > translation is needed I have simply removed the incorrect one. This > will mark that line as untranslated and hopefully someone will see > that. It will also default to English with the correct message until > translated. That's what fuzzy is for, there's no reason to remove them. -- Alexandre Julliard julliard(a)winehq.org

3 3

Wine 1.6 list of deferred patches
by Bruno Jesus July 22, 2013

July 22, 2013

This is the list of (hopefully) all deferred patches for wine 1.6, all authors are in bcc. I hope it's useful for developers. 97187 Deferred Dmitry Timoshkov [3/3] kernel32: GetShortPathName for a non-existent short file name should fail. 97131 Deferred Rosen Diankov [ole32] Bugfix for implicit MTA apartment initialization 97130 Deferred Rosen Diankov [oleaut32] Bugfix patches for marshaling VT_UNKNOWN in SAFEARRAYS 97124 Deferred Maarten Lankhorst [RFC PATCH] loader: allow overriding pthread_create correctly on linux 97119 Deferred Fabian Ebner [PATCH] dinput: Check the message queue in GetDeviceState * 97085 Deferred Dmitry Timoshkov ntdll: NtAllocateVirtualMemory should fail to commit if an address range is already committed for a memory mapped file. 96974 Deferred Stefan Dösinger [PATCH 2/2] wined3d: Avoid calculating 1 / (fog_end - fog_start) in the shader 96961 Deferred Mathis Beer ntdll: make msync() call asynchronous in NtFlushVirtualMemory (try 3.5, alternate version) 96925 Deferred Hans Leidekker server: The token user SID must be present in the default DACL. 96899 Deferred Stefan Dösinger [PATCH 1/5] wined3d: Consolidate d3d_info BOOLs into a flags field 96855 Deferred Alistair Leslie-Hughes oledb32: Add IErrorInfo Support OK 96854 Deferred Alistair Leslie-Hughes msdaps: Add support for ISourcesRowset (try 2) 96831 Deferred Christian Costa [PATCH] d3dxof: Remove LP stuff and rename variables for IDirectXFile methods. 96819 Deferred Nikolay Sivov comctl32: Properly handle repainting for HDF_OWNERDRAW items 96797 Deferred André Hentschel ntdll: Add stub for LdrResolveDelayLoadedAPI and reference it in kernel32 (try 2) 96793 Deferred Christian Costa [PATCH] d3dx9_36: Implement D3DXGetShaderInputSemantics + tests. 96791 Deferred morphiend msvcrt: add support for _chsize_s 96765 Deferred Christian Costa [PATCH 2/4] d3dxof: Handle float in binary mode and remove code that becomes useless. * this patch was already commited.

1 0

Re: [PATCH 3/4] d3dx9: Improve ID3DXConstantTable::Set*().
by Alexandre Julliard July 22, 2013

July 22, 2013

Rico Schüller <kgbricola(a)web.de> writes: > +static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, struct ctab_constant *constant, > + const void **indata, D3DXPARAMETER_TYPE intype, UINT *size, UINT incol, D3DXPARAMETER_CLASS inclass, UINT index, > + BOOL is_pointer) > +{ > + DWORD (*get_index)(const void **indata, UINT index) = NULL; > + D3DXCONSTANT_DESC *desc = &constant->desc; > + UINT l, i, regcount = 1, regsize = 1, cin = 1, rin = 1, ret, last = 0; > + DWORD tmp; > + > + if (is_pointer) get_index = &get_index_pointer; > + else get_index = &get_index_array; It would be cleaner and easier to follow to have a simple helper with a is_pointer flag, rather than using function pointers with such trivial functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msxml3: Defer the conversion of XPath expressions to UTF-8. (try 2)
by Nikolay Sivov July 21, 2013

July 21, 2013

On 7/20/2013 23:37, John Chadwick wrote: > This patch changes the create_selection interface to accept a wide string > instead of an xmlChar string. This is a transitional change, which will be > needed as libxml2's XPath parser is phased out. > > The last submission had a memory leak (sorry, I isolated this change > from some other changes and accidentally axed a heap_free in the > process.) Looks ok, I didn't try tests, but I hope you did.. One thing though: > +static inline WCHAR *heap_strcatW(WCHAR *a, const WCHAR *b) > +{ > + int len = strlenW(a) + strlenW(b); > + WCHAR *c = heap_realloc(a, (len + 1) * sizeof(WCHAR)); > + WCHAR *ptr = c; > + > + while(*ptr) > + ptr++; > + while(*b) > + *(ptr++) = *(b++); > + c[len] = 0; > + > + return c; > +} > + I'm assuming you didn't use strcatW() to avoid one more strlenW()? Even if you don't want to use it for some reason, you don't need first loop cause you already know 'a' length, and second loop is just strcpyW(). Also I suggest to use 'dst', 'src' names for parameters.

1 0

Coverity Status
by Marcus Meissner July 20, 2013

July 20, 2013

Hi, For Wine 1.6 we have the following Coverity stats: - 3,648,322 Lines of Code scanned - Defect Density 0.51 - 8321 total defects - 1852 outstanding (unresolved) defects - 1964 dismissed defects - 4505 fixed defects git shortlog wine-1.4..wine-1.6|grep -i Coverity|wc -l 225 Thanks to AmineKhaldi uploading the builds and everyone reviewing and fixing coverity issues :) Ciao, Marcus

1 0

Another major milestone
by Jeremy White July 19, 2013

July 19, 2013

Alright folks, I have to confess that the 1.6 release came and I didn't immediately get up and dance. In fact, a new Wine release was almost...boring. I think we have to consider that a major milestone in of itself. New, useful releases are just a matter of course for us now. Woohoo! Now I'm dancing <grin>. Cheers, Jeremy

8 9

Re: [docs] winelib: Use proper entity escaping for '&','<' and '>'
by Julian Rüger July 19, 2013

July 19, 2013

Hi Frédéric, > - $(CC) $(CC_OPTS) -DRC_INVOKED -E -x c $< | $(WRC) -N $(WRCFLAGS) $(WINELIB_FLAGS) -o $@ > + $(CC) $(CC_OPTS) -DRC_INVOKED -E -x c $lt; | $(WRC) -N $(WRCFLAGS) $(WINELIB_FLAGS) -o $@ looks like you forgot the "&". Best, Julian

2 1

Re: [2/2] gdiplus: Store graphics clipping region in device coordinates.
by Vincent Povirk July 19, 2013

July 19, 2013

I'm curious what happens if the world transform has some rotation. It seems like transform_rectf would break in that case.

2 2

Re: [1/2] windowscodecs: Add a test for global GIF palette exposed by recent Windows versions.
by Vincent Povirk July 19, 2013

July 19, 2013

The series looks good to me.

1 0

Re: [1/4] wincodecs: Added IWICBitmapClipper stub
by Vincent Povirk July 19, 2013

July 19, 2013

This series looks good to me.

1 0

Re: riched20: Add tests for ITextRange interface.
by Nikolay Sivov July 19, 2013

July 19, 2013

On 7/18/2013 20:28, Caibin Chen wrote: > Add tests for start and end point, setting and getting text. > --- > dlls/riched20/tests/Makefile.in | 3 +- > dlls/riched20/tests/txtrng.c | 343 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 345 insertions(+), 1 deletion(-) > create mode 100644 dlls/riched20/tests/txtrng.c You could just use existing file, richole.c fits I think.

2 7

Re: Patches I maintain
by Rico Schüller July 18, 2013

July 18, 2013

Hi Roland, I'm not exactly sure what your goal is... but there is a rule one patch per mail only! There is likely no chance to get something like that mixture committed. You may have a look here: http://wiki.winehq.org/SubmittingPatches On 18.07.2013 01:23, Roland Haeder wrote: > +HRESULT D3DXCreatePolygon(LPDIRECT3DDEVICE9 device, float length, UINT sides, LPD3DXMESH *mesh, LPD3DXBUFFER adjacency) Well this looks a little bit wrong. You may have a look here http://msdn.microsoft.com/en-us/library/windows/desktop/bb172785%28v=vs.85%… . Don't copy and paste it. A patch which by accident works, is not something which should be applied at all. There are several issues alone in that line. Cheers Rico

2 1

Re: winedev: Add doc for winedbg symbol_picker option
by Frédéric Delanoy July 17, 2013

July 17, 2013

On Thu, Jul 18, 2013 at 12:48 AM, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > --- > en/winedev-debugger.sgml | 21 +++++++++++++++++++++ > 1 files changed, 21 insertions(+), 0 deletions(-) > Please discard this. It has been committed a long time ago. Sorry (again) for the noise. Frédéric

1 0

Manpage patch, please review
by Julian Rüger July 17, 2013

July 17, 2013

Hi all! While working on the translation of the (main) manpage, I noticed a few issues in the English version and started working on a patch. That was quite some time ago, I had little spare time lately and didn't get around to finish and send it in. So I figured I just take what I have now and ask you guys for comments. I appreciate any remarks or suggestions. Thanks, Julian Notes: I had a change similar to Frédéric's, mentioning wine can run 64-bit programs now. He was quicker and I like his wording better. I had something like "[...]or Win64 executable (if your version of wine was compiled with 64-bit support)." I guess that would be more confusing to people using their distro's wine packages and people compiling their own wine know that anyway. Do you agree or do you think it's better to be more specific? CUI -> CLI: According to Google and Wikipedia, CLI is more common. -.BR @bindir@/wineserver , +.IR @bindir@/wineserver , and following, similar changes: This is the way it is formatted in the wineserver manpage. I noticed there is no uniform style across our manpages, so we should have a guideline. Should paths be bold or italic/underlined?

2 4