November 2015 - Wine-devel - list.winehq.org

Re: [PATCH] odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString (try 2)
by Nikolay Sivov 08 Nov '15

08 Nov '15

On 08.11.2015 13:09, Alistair Leslie-Hughes wrote: > + ret = RegOpenKeyW(hkeyfilename, section, &hkeysection); > + RegCloseKey(hkeyfilename); > + > + return hkeysection; I didn't mean that you need to remove error handling completely, last return in previous iteration 'return ret ? ...' was fine.

1 0

Re: include: Add d3dx10.h file (try 3)
by Matteo Bruni 08 Nov '15

08 Nov '15

I know I told you otherwise earlier, but looking again now: please use an unsigned literal for DXGI_FORMAT_FROM_FILE too, the definition of DXGI_FORMAT has a "DXGI_FORMAT_FORCE_UINT" entry so it should use unsigned values. While you're at it, you can drop the parentheses from the 3 defines.

1 0

Re: *.idl: Use correct type for BSTR strings in the defaultvalue() statements.
by Nikolay Sivov 06 Nov '15

06 Nov '15

On 06.11.2015 11:37, Dmitry Timoshkov wrote: > This matches midl/PSDK syntax, and allows to use Wine headers for compiling > applications with a C++ win32/win64 compiler. In order to be usable by C++ > unix compilers widl needs to emit appropriate statically initialized WCHAR > strings, but that's a different problem, currently the generated Wine headers > with default(BSTR) statements can't be used with C++ at all. > Where do you see this? Mshtml.idl from Windows 10 SDK doesn't use this notation, and in fact only fsrm*.idl files do, so it's not a common practice. Generated headers should use L"", like you said. But only in case of empty strings. Also leaving this broken for everything that's not PSDK compiler doesn't sound right.

3 8

Re: [PATCH 1/3] msvcrt: Lock the heap in _callnewh
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/06/15 11:28, Martin Storsjo wrote: > int CDECL _callnewh(MSVCRT_size_t size) > { > + int ret = 0; > + LOCK_HEAP; > if(MSVCRT_new_handler) > - (*MSVCRT_new_handler)(size); > - return 0; > + ret = (*MSVCRT_new_handler)(size); > + UNLOCK_HEAP; > + return ret; > } It doesn't make sense to lock heap cs in this case. Native is not doing it (at least in case of msvcp90.dll). The return value change looks almost correct - the function only returns 0 or 1. Thanks, Piotr

2 3

Re: [PATCH 1/2] winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate.
by Huw Davies 06 Nov '15

06 Nov '15

On Fri, Nov 06, 2015 at 02:47:10AM -0600, Ken Thomases wrote: > dlls/winemac.drv/Makefile.in | 2 +- > dlls/winemac.drv/cocoa_window.h | 2 + > dlls/winemac.drv/cocoa_window.m | 166 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 169 insertions(+), 1 deletion(-) Hi Ken, This doesn't build for me on 10.7: gcc -m32 -c -o cocoa_window.o cocoa_window.m -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wstrict-prototypes \ -Wwrite-strings -Wpointer-arith -gdwarf-2 -fno-omit-frame-pointer -g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 cocoa_window.m:161: error: expected specifier-qualifier-list before ‘CVDisplayLinkRef’ cocoa_window.m:174: error: expected ‘)’ before ‘displayLink’ cocoa_window.m: In function ‘-[WineDisplayLink initWithDisplayID:]’: cocoa_window.m:181: warning: implicit declaration of function ‘CVDisplayLinkCreateWithCGDisplay’ cocoa_window.m:181: error: ‘_link’ undeclared (first use in this function) cocoa_window.m:181: error: (Each undeclared identifier is reported only once cocoa_window.m:181: error: for each function it appears in.) cocoa_window.m:185: warning: implicit declaration of function ‘CVDisplayLinkSetOutputCallback’ cocoa_window.m:185: error: ‘WineDisplayLinkCallback’ undeclared (first use in this function) cocoa_window.m: In function ‘-[WineDisplayLink dealloc]’: cocoa_window.m:200: error: ‘_link’ undeclared (first use in this function) cocoa_window.m:202: warning: implicit declaration of function ‘CVDisplayLinkStop’ cocoa_window.m:203: warning: implicit declaration of function ‘CVDisplayLinkRelease’ cocoa_window.m: In function ‘-[WineDisplayLink addWindow:]’: cocoa_window.m:215: warning: implicit declaration of function ‘CVDisplayLinkStart’ cocoa_window.m:215: error: ‘_link’ undeclared (first use in this function) cocoa_window.m: In function ‘-[WineDisplayLink removeWindow:]’: cocoa_window.m:225: error: ‘_link’ undeclared (first use in this function) cocoa_window.m: At top level: cocoa_window.m:242: error: expected ‘)’ before ‘displayLink’ cocoa_window.m: In function ‘+[WineWindow createWindowWithFeatures:windowFrame:hwnd:queue:]’: cocoa_window.m:689: error: request for member ‘autodisplay’ in something not a structure or union cocoa_window.m: In function ‘-[WineWindow orderBelow:orAbove:activate:]’: cocoa_window.m:1310: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m:1310: warning: (Messages without a matching method signature cocoa_window.m:1310: warning: will be assumed to return ‘id’ and accept cocoa_window.m:1310: warning: ‘...’ as arguments.) cocoa_window.m:1329: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m: In function ‘-[WineWindow doOrderOut]’: cocoa_window.m:1370: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1372: warning: ‘WineWindow’ may not respond to ‘-grabDockIconSnapshotFromWindow:force:’ cocoa_window.m:1383: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m: In function ‘-[WineWindow checkWineDisplayLink]’: cocoa_window.m:1682: warning: ‘WineWindow’ may not respond to ‘-isEmptyShaped’ cocoa_window.m:1689: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1694: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow grabDockIconSnapshotFromWindow:force:]’: cocoa_window.m:1744: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1761: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1774: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1781: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1785: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1788: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1805: warning: ‘NSImage’ may not respond to ‘-drawInRect:’ cocoa_window.m:1811: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow miniaturize:]’: cocoa_window.m:2031: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow windowWillResize:toSize:]’: cocoa_window.m:2413: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow draggingEntered:]’: cocoa_window.m:2554: warning: ‘WineWindow’ may not respond to ‘-draggingUpdated:’ cocoa_window.m:2554: warning: return makes integer from pointer without a cast make[1]: *** [cocoa_window.o] Error 1 make: *** [dlls/winemac.drv] Error 2

2 5

Re: [PATCH 2/3] msvcrt: Use the right _iob functions in the public msvcrt header for ucrtbase
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/06/15 11:28, Martin Storsjo wrote: > #ifndef _STDIO_DEFINED > -# ifdef __i386__ > -FILE* __cdecl __p__iob(void); > -# define _iob (__p__iob()) > +# ifdef UCRTBASE > +FILE* __cdecl __acrt_iob_func(unsigned); > +# define _iob(x) (__acrt_iob_func(x)) > # else > +# ifdef __i386__ > +FILE* __cdecl __p__iob(void); > +# define _iob(x) (__p__iob() + (x)) > +# else > FILE* __cdecl __iob_func(void); > -# define _iob (__iob_func()) > +# define _iob(x) (__iob_func() + (x)) > +# endif This makes _iob definition incompatible with native headers. It can't be done this way. I don't know how to solve this problem. Maybe adding something like this in msvcp90/ios.c will be acceptable: #if _MSVCP_VER >= 140 FILE* __cdecl __acrt_iob_func(unsigned); #undef stdin #define stdin __acrt_iob_func(STDIN_FILENO) ... #endif Thanks, Piotr

1 0

Re: [RFC PATCH] msvcp140: Add MSVC 2015 C++ support DLL
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/04/15 20:12, Martin Storsjo wrote: > The built DLL links to (and loads function pointers at runtime from) > msvcr120, instead of ucrtbase (which would be more correct). We really need to e.g. share file handles between ucrtbase and msvcp140. We will need to find a way of linking against ucrtbase. It will probably need to be done by defining wrappers around some functions. For example missing _invalid_parameter should be probably worked around by defining following function in msvcp140: void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t arg) { return _invalid_parameter_noinfo(); } Something similar needs to be done with __p__iob (use __acrt_iob_func function). If you have any problems with other function please let me know. Probably some more testing/work will be needed to deal with missing new/delete functions. Thanks, Piotr

2 3

Re: *.idl: Use correct type for BSTR strings in the defaultvalue() statements.
by Marvin 06 Nov '15

06 Nov '15

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=18008 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0

Re: [2/2 v2] riched20: Implement alignment styles support.
by Huw Davies 06 Nov '15

06 Nov '15

On Fri, Nov 06, 2015 at 10:44:57AM +0800, Jactry Zeng wrote: > --- a/dlls/riched20/editor.h > +++ b/dlls/riched20/editor.h > @@ -213,7 +213,7 @@ void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HID > BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; > void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; > void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; > -void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; > +void ME_SetDefaultParaFormat(DWORD alignStyle, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; Why did you change this? Your last patch had ME_TextEditor* as the first parameter, which was much better. > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -7951,6 +7951,77 @@ static void test_EM_SETFONTSIZE(void) > DestroyWindow(richedit); > } > > + ^ There's a trailing space here. Huw.

2 1

Re: *.idl: Use correct type for BSTR strings in the defaultvalue() statements.
by Marvin 06 Nov '15

06 Nov '15

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=18007 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0