December 2009 - Wine-devel - list.winehq.org

Re: [1/2] wininet: Always set last error in HttpSendRequest{,Ex}.
by Paul Vriens 22 Dec '09

22 Dec '09

On 12/21/2009 11:13 AM, Hans Leidekker wrote: > + SetLastError(0xdeadbeef); > r = HttpSendRequest(hr, NULL, 0, NULL, 0); > + error = GetLastError(); > ok(r, "HttpSendRequest failed\n"); > + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); Hi Hans, This one introduces 5 (sometimes extra) failures on Win98/WinMe: http://test.winehq.org/data/tests/wininet:http.html Not all test_basic_request() fail btw: test_basic_request(si.port, "GET", "/test1"); /* FAILS */ test_basic_request(si.port, "POST", "/test5"); /* FAILS */ test_basic_request(si.port, "RPC_IN_DATA", "/test5"); /* SUCCEEDS */ test_basic_request(si.port, "RPC_OUT_DATA", "/test5"); /* SUCCEEDS */ test_basic_request(si.port, "GET", "/test6"); /* FAILS */ test_basic_request(si.port, "GET", "/testF"); /* FAILS */ test_basic_request(si.port, "GET", "/quit"); /* FAILS */ For simplicity we could just add a broken() although that's not a 100% correct. Or only use broken() when dealing with GEt/POST? Thoughts? -- Cheers, Paul.

1 0

Re: mshtml: Added JavaScript tests architecture and simple tests.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/mshtml/tests/Makefile.in | 2 + > dlls/mshtml/tests/jstest.html | 20 ++ > dlls/mshtml/tests/rsrc.rc | 20 ++ > dlls/mshtml/tests/script.c | 735 > ++++++++++++++++++++++++++++++++++++++++- > 4 files changed, 759 insertions(+), 18 deletions(-) > create mode 100644 dlls/mshtml/tests/jstest.html > create mode 100644 dlls/mshtml/tests/rsrc.rc It doesn't work here: ../../../tools/runtest -q -P wine -M mshtml.dll -T ../../.. -p mshtml_test.exe.so script.c && touch script.ok 0[157e88]: IMM32: InitKeyboardLayout, aKeyboardLayout=04090409, sCodePage=1252, sIMEProperty=00090000 0[157e88]: IMM32: InitKeyboardLayout, aKeyboardLayout=04090409, sCodePage=1252, sIMEProperty=00090000 0[157e88]: file wine:res://Z:/home/julliard/wine/wine/dlls/mshtml/tests/mshtml_test.exe/jstest.html, line 5: ReferenceError: external is not defined -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: tools/widl: Split expr_int_const off from expr
by Rob Shearman 21 Dec '09

21 Dec '09

2009/6/28 Gerald Pfeifer <gerald(a)pfeifer.com>: > diff --git a/tools/widl/parser.y b/tools/widl/parser.y > index c2f1abc..01aa060 100644 > --- a/tools/widl/parser.y > +++ b/tools/widl/parser.y > @@ -622,56 +633,54 @@ m_expr: { $$ = make_expr(EXPR_VOID); } > | expr > ; > > -expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } > - | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } > +expr: expr_int_const > | aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, $1); } > + | '-' aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, -($2)); } This is covered by the production for the binary minus operator that already exists, so I'm not sure what you're trying to achieve here. > | tFALSE { $$ = make_exprl(EXPR_TRUEFALSE, 0); } > - | tNULL { $$ = make_exprl(EXPR_NUM, 0); } > | tTRUE { $$ = make_exprl(EXPR_TRUEFALSE, 1); } > | aSTRING { $$ = make_exprs(EXPR_STRLIT, $1); } > | aWSTRING { $$ = make_exprs(EXPR_WSTRLIT, $1); } > - | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } > | expr '?' expr ':' expr { $$ = make_expr3(EXPR_COND, $1, $3, $5); } > | expr LOGICALOR expr { $$ = make_expr2(EXPR_LOGOR, $1, $3); } > | expr LOGICALAND expr { $$ = make_expr2(EXPR_LOGAND, $1, $3); } > - | expr '|' expr { $$ = make_expr2(EXPR_OR , $1, $3); } > - | expr '^' expr { $$ = make_expr2(EXPR_XOR, $1, $3); } > - | expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); } > | expr EQUALITY expr { $$ = make_expr2(EXPR_EQUALITY, $1, $3); } > | expr INEQUALITY expr { $$ = make_expr2(EXPR_INEQUALITY, $1, $3); } > | expr '>' expr { $$ = make_expr2(EXPR_GTR, $1, $3); } > | expr '<' expr { $$ = make_expr2(EXPR_LESS, $1, $3); } > | expr GREATEREQUAL expr { $$ = make_expr2(EXPR_GTREQL, $1, $3); } > | expr LESSEQUAL expr { $$ = make_expr2(EXPR_LESSEQL, $1, $3); } > - | expr SHL expr { $$ = make_expr2(EXPR_SHL, $1, $3); } > - | expr SHR expr { $$ = make_expr2(EXPR_SHR, $1, $3); } > - | expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); } > - | expr '-' expr { $$ = make_expr2(EXPR_SUB, $1, $3); } > - | expr '%' expr { $$ = make_expr2(EXPR_MOD, $1, $3); } > - | expr '*' expr { $$ = make_expr2(EXPR_MUL, $1, $3); } > - | expr '/' expr { $$ = make_expr2(EXPR_DIV, $1, $3); } > | '!' expr { $$ = make_expr1(EXPR_LOGNOT, $2); } > - | '~' expr { $$ = make_expr1(EXPR_NOT, $2); } > - | '+' expr %prec POS { $$ = make_expr1(EXPR_POS, $2); } > - | '-' expr %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } > | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } > | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } > | expr MEMBERPTR aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, $1), make_exprs(EXPR_IDENTIFIER, $3)); } > | expr '.' aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, $1, make_exprs(EXPR_IDENTIFIER, $3)); } > | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } > - | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } > | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } > - | '(' expr ')' { $$ = $2; } > ; > > expr_list_int_const: expr_int_const { $$ = append_expr( NULL, $1 ); } > | expr_list_int_const ',' expr_int_const { $$ = append_expr( $1, $3 ); } > ; > > -expr_int_const: expr { $$ = $1; > - if (!$$->is_const) > - error_loc("expression is not an integer constant\n"); > - } > +expr_int_const: aNUM { $$ = make_exprl(EXPR_NUM, $1); } > + | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } > + | tNULL { $$ = make_exprl(EXPR_NUM, 0); } > + | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } aIDENTIFIER isn't necessarily a constant expression. > + | '~' expr_int_const { $$ = make_expr1(EXPR_NOT, $2); } > + | '+' expr_int_const %prec POS { $$ = make_expr1(EXPR_POS, $2); } > + | '-' expr_int_const %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } > + | expr_int_const SHL expr_int_const { $$ = make_expr2(EXPR_SHL, $1, $3); } > + | expr_int_const SHR expr_int_const { $$ = make_expr2(EXPR_SHR, $1, $3); } > + | expr_int_const '+' expr_int_const { $$ = make_expr2(EXPR_ADD, $1, $3); } > + | expr_int_const '-' expr_int_const { $$ = make_expr2(EXPR_SUB, $1, $3); } > + | expr_int_const '%' expr_int_const { $$ = make_expr2(EXPR_MOD, $1, $3); } > + | expr_int_const '*' expr_int_const { $$ = make_expr2(EXPR_MUL, $1, $3); } > + | expr_int_const '/' expr_int_const { $$ = make_expr2(EXPR_DIV, $1, $3); } > + | expr_int_const '|' expr_int_const { $$ = make_expr2(EXPR_OR , $1, $3); } > + | expr_int_const '^' expr_int_const { $$ = make_expr2(EXPR_XOR, $1, $3); } > + | expr_int_const '&' expr_int_const { $$ = make_expr2(EXPR_AND, $1, $3); } Using "expr_int_const" instead of "expr" here prevents a many forms of expressions from being parsed. > + | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } > + | '(' expr ')' { $$ = $2; } > ; > > expr_const: expr { $$ = $1; It looks like you'll have to find another way of fixing the issue you are trying to fix. -- Rob Shearman

3 2

Re: qedit.dll: Add minimal stubs for NullRenderer and SampleGrabber
by Alexandre Julliard 21 Dec '09

21 Dec '09

Paul Chitescu <paulc(a)voip.null.ro> writes: > Changelog: > qedit.dll: Add minimal stubs for NullRenderer and SampleGrabber. > > It doesn't make much sense to break this patch in two since most applications > connect a SampleGrabber to a NullRenderer to capture frames. That doesn't mean you can't split the patch. > +#define DEF_COMMON(iface)\ > +static ULONG WINAPI NullRenderer_ ## iface ## _AddRef(iface *ptr)\ > +{\ > + return InterlockedIncrement(&GET_THIS(ptr,iface)->refCount);\ > +}\ > +static ULONG WINAPI NullRenderer_ ## iface ## _Release(iface *ptr)\ > +{\ > + NR_Impl *This = GET_THIS(ptr,iface);\ > + ULONG refCount = InterlockedDecrement(&This->refCount);\ > + if (refCount == 0) \ > + {\ > + NullRenderer_cleanup(This);\ > + CoTaskMemFree(This);\ > + return 0;\ > + }\ > + return refCount;\ > +}\ > +static HRESULT WINAPI NullRenderer_ ## iface ## _QueryInterface(iface *ptr, REFIID riid, void **ppvObject)\ > +{\ > + return NullRenderer_query(GET_THIS(ptr,iface), riid, ppvObject);\ > +} > + > +/* Macro to put common IUnknown pointers in interface's vtable */ > +#define VTBL_COMMON(iface)\ > +NullRenderer_ ## iface ## _QueryInterface,\ > +NullRenderer_ ## iface ## _AddRef,\ > +NullRenderer_ ## iface ## _Release, Please don't add ugly macros like those, spell things out explicitly. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 3/4] kernel32/path: Fix last error in SearchPathA/W with tests
by Paul Vriens 21 Dec '09

21 Dec '09

On 12/21/2009 02:32 AM, Nikolay Sivov wrote: > Fix last error in SearchPathA/W with tests > Hi Nikolay, Any reason all tests are relying on both the A- and W-version being available? SearchPathA is implemented on Win98. SearchPathW is exported but not implemented. This means the current tests will fail on Win98 for example: path.c:1490: Test failed: Expected ERROR_INVALID_PARAMETER, got 2 path.c:1497: Test failed: Expected ERROR_INVALID_PARAMETER, got 78 path.c:1504: Test failed: Expected ERROR_INVALID_PARAMETER, got 78 So SearchPathA returns something different for the last error and the SearchPathW tests already fail because GetWindowsDirectoryW() is not implemented (next to SearchPathW itself not being implemented of course). -- Cheers, Paul.

2 3

some 16 bit apps crash with gcc-4.3 (Ubuntu Intrepid); work with 4.2 (Hardy) - Caesar 3
by Joerg-Cyril.Hoehle＠t-systems.com 21 Dec '09

21 Dec '09

Hi, the news is that a few 16bit apps crash in Wine, apparently depending on the gcc version used to compile Wine. This was known to affect copy-protected apps, but in the present case, copy protection is not involved. >perhaps that old wine-1.1.16 was compiled with Ubuntu Hardy, not Intrepid... Indeed that is the difference: - Meine Traumburg (children game probably nobody knows outside Germany) crashes at start; - Caesar III from Sierra (mine is the German version) aborts before the second installer screen ("error 112") with no revealing error message or stack dump using a Wine compiled in Ubuntu Intrepid. They work fine with a Wine compiled in Ubuntu Hardy. Sorry, I don't use any newer Ubuntu (yet). Wine-1.1.16 and 1.1.34 behave the same. http://wiki.winehq.org/GccVersions mentions that some versions of gcc miscompile some code relevant for copy protection. However the above apps are not protected AFAICT! (They are trivial to install on HD without the need for the CD at run-time.) So gcc (presumably) affects "regular" code in Wine. The winesrc/include/config.h file on both systems is the same except for one line about mpg123; that's why I believe gcc is to blame (or Wine does some 16bit assembly magic that's not supported by gcc and thus produces random results). Hardy uses gcc-4.2 (Wiki page says "known to work/this isn't certain") Intrepid uses gcc-4.3 (Wiki page says "not tested") It would be interesting to re-evaluate bugs.winehq for bugs with keyword "win16". Regards, Jörg Höhle

1 0

Re: [2/2] wininet: Free per-thread error info upon exit from an async procedure.
by Jacek Caban 21 Dec '09

21 Dec '09

Hi Hans. On 12/21/09 11:14 AM, Hans Leidekker wrote: > Found by Valgrind. > --- > dlls/wininet/internet.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c > index d749e53..2b8d767 100644 > --- a/dlls/wininet/internet.c > +++ b/dlls/wininet/internet.c > @@ -3127,8 +3127,12 @@ static DWORD CALLBACK INTERNET_WorkerThreadFunc(LPVOID lpvParam) > HeapFree(GetProcessHeap(), 0, lpRequest); > > workRequest.asyncproc(&workRequest); > - > WININET_Release( workRequest.hdr ); > + > + if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES) > + { > + HeapFree(GetProcessHeap(), 0, TlsGetValue(g_dwTlsErrIndex)); > + } > You have to set TLS value to NULL otherwise it will crash on next INTERNET_SetLastError in the same thread on another async call. But the right way to fix this is to get rid of INTERNET_[GS]etLastError. This is useless and has proven to result in code that has many failure paths without last error set. I've already removed most of these calls and I'm near to getting rid of all of them except ones in ftp.c. Thanks, Jacek

2 1

Isn't it a bug?
by Luis Busquets 21 Dec '09

21 Dec '09

From some time when I run Civilization4 I get a myriad of these messages and others with other formats: err:d3d:getColorBits Unsupported format: WINED3DFMT_R16G16_FLOAT err:d3d:IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt Unable to check compatibility for Format=WINED3DFMT_R16G16_FLOAT After looking in the wine code I have found out that what happens is that Civ calls the function IDirect3D9Impl_CheckDepthStencilMatch The implementation of wine then calls IWineD3D_CheckDepthStencilMatch which then calls IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt <http://source.winehq.org/ident?i=IWineD3DImpl_IsPixelFormatCompatibleWithRe…> for each format that the adapter supports until it finds a supported format: Problem: IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt <http://source.winehq.org/ident?i=IWineD3DImpl_IsPixelFormatCompatibleWithRe…> tries to match the supported pixel format of the adapter with the requested format. If the supported pixel format of the adapter is of type WGL_TYPE_RGBA_ARB, it tries to getColorBits of the format even if the format to try is a floating format, getColorBits responds with an error and same does IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt <http://source.winehq.org/ident?i=IWineD3DImpl_IsPixelFormatCompatibleWithRe…>. Certainly, the answer is correct (FALSE) but the problem is that it fills the screen with ERR that are due to wine checking things for which there is no need as they are directly false. So my question is if it is possible to do IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt <http://source.winehq.org/ident?i=IWineD3DImpl_IsPixelFormatCompatibleWithRe…> right away check if: cfg->iPixelType ==WGL_TYPE_RGBA_ARB <http://source.winehq.org/ident?i=WGL_TYPE_RGBA_ARB> and format_desc is a floating format then return FALSE right away no need to fill ERR same if cfg->iPixelType ==WGL_TYPE_RGBA_FLOAT_AR <http://source.winehq.org/ident?i=WGL_TYPE_RGBA_FLOAT_ARB>B <http://source.winehq.org/ident?i=WGL_TYPE_RGBA_ARB> and format_desc is not a floating format then return FALSE right away no need to fill ERR If you do not like this solution, getColorBits could be modified so that it does not file an error for floating point formats but just responds with 0 for all bit sizes when the format is a floating point without filling an error. What do you prefer? Can somebody propose a patch with this kind of behaviour or something better so that my Civ4 does not respond with this myriad of errors? <http://source.winehq.org/ident?i=WGL_TYPE_RGBA_ARB>

2 2

Limit Bugzilla fields access
by Nikolay Sivov 21 Dec '09

21 Dec '09

Hi. I think it's not bad to remove some not useful in Wine's bugzilla fields from bug page: - whiteboard: what is it for? - difficulty - this really means nothing, usually set by reporter and not used by developers at all; - alias - used by reporters some times, but often reset by bugzilla buys (don't know why actually). Also it might be good to enable version field only on bug creation for people with report only permissions, version is often changed after reporter tested app again on newer version, after that bugzilla maintainers change it back and so on. The less the better, should be a rule here. Don't know is some of that fields configurable or code change required, but still I'm sure it's possible. Thanks.

2 1

WineTestBot changes
by Greg Geldorp 20 Dec '09

20 Dec '09

Updates to the test bot: - Improve log parsing and error reporting - Send notification email on job completion - Run winetest64-latest.exe on 64-bit machines - Show warning message if job is submitted without command line arg - Attempt to display times in users own timezone - Add possibility to set WINETEST_DEBUG and WINETEST_REPORT_SUCCESS env vars The code (LGPL) is now hosted on SourceForge in the "wine/winetestbot" git repository. Ge.

1 0