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

Re: [patch] rpcrt4_conn_np_read needs to expect and accept ERROR_MORE_DATA
by Juan Lang 06 Feb '09

06 Feb '09

Hi Luke, @@ -382,7 +382,14 @@ static int rpcrt4_conn_np_read(RpcConnection *Connection, { DWORD bytes_read; ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); - if (!ret || !bytes_read) + if (!ret) + { + TRACE("ReadFile error, status %x\n", GetLastError()); + if (GetLastError() != ERROR_MORE_DATA) + break; + ret = TRUE; /* ERROR_MORE_DATA is an expected acceptable error code */ + } + if (!bytes_read) break; Style nit: it would be simpler to do: DWORD bytes_read; ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); + if (!ret && GetLastError() == ERROR_MORE_DATA) + ret = TRUE; if (!ret || !bytes_read) break; Don't you think? --Juan

2 1

Re: Use environment variable WINE_NO_MENU_ENTRIES to prevent menu icon and menu entry creation.
by Detlef Riekenberg 06 Feb '09

06 Feb '09

On Do, 2009-02-05 at 18:02 +0100, Christoph Korn wrote: > int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR > cmdline, int show) > { > + if(getenv("WINE_NO_MENU_ENTRIES")) > + { > + return 0; > + } > + > LPSTR token = NULL, p; Declaring a variable after code is C99 and not allowed in Wine. -- By by ... Detlef

2 1

Re: widl: initialize _RetVal to avoid compiler warnings
by Rob Shearman 06 Feb '09

06 Feb '09

2009/2/5 Christoph von Wittich <Christoph(a)apiviewer.de>: > --- a/tools/widl/proxy.c > +++ b/tools/widl/proxy.c > @@ -327,7 +327,12 @@ static void gen_proxy(type_t *iface, const var_t > *func, int idx, > if (has_ret) { > print_proxy( "" ); > write_type_decl_left(proxy, type_function_get_rettype(func->type)); > - print_proxy( " _RetVal;\n"); > + > + /* Initialize _RetVal properly in order to avoid compiler warnings */ > + if (is_ptr(type_function_get_rettype(func->type)) || > is_array(type_function_get_rettype(func->type))) > + print_proxy(" _RetVal = NULL;\n"); > + else > + print_proxy(" _RetVal = 0;\n"); > } > print_proxy( "RPC_MESSAGE _RpcMessage;\n" ); > if (has_ret) { I think this is just hiding the problem. Can you give an example of IDL which causes widl to generate code that causes compiler warnings? -- Rob Shearman

1 0

Re: rpcrt4: Check for null endpoint in RpcServerUseProtseqEpExW
by Rob Shearman 06 Feb '09

06 Feb '09

2009/2/5 Nikolay Sivov <bunglehead(a)gmail.com>: > Changelog: > - Check for null endpoint in RpcServerUseProtseqEpExW. > Installed IE8 RC1 crashes on this call, parameter set is specified in > test case. > > >From 89f889b2c7a754302b599884577b4eba22b3d235 Mon Sep 17 00:00:00 2001 > From: Nikolay Sivov <bunglehead(a)gmail.com> > Date: Thu, 5 Feb 2009 22:03:48 +0300 > Subject: Check for null endpoint in RpcServerUseProtseqEpExW > > --- > dlls/rpcrt4/rpc_server.c | 6 ++++-- > dlls/rpcrt4/tests/rpc.c | 15 +++++++++++++++ > 2 files changed, 19 insertions(+), 2 deletions(-) > > diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c > index b6e058a..e9bed42 100644 > --- a/dlls/rpcrt4/rpc_server.c > +++ b/dlls/rpcrt4/rpc_server.c > @@ -775,8 +775,10 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC > return status; > > EndpointA = RPCRT4_strdupWtoA(Endpoint); > - status = RPCRT4_use_protseq(ps, EndpointA); > - RPCRT4_strfree(EndpointA); > + if (EndpointA) { > + status = RPCRT4_use_protseq(ps, EndpointA); > + RPCRT4_strfree(EndpointA); > + } This isn't correct, I'm afraid. The protseq open function should generate an endpoint name to use. For example, the ncacn_ip_tcp code should select a random available TCP port. > return status; > } > > diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c > index bf538e4..b815acc 100644 > --- a/dlls/rpcrt4/tests/rpc.c > +++ b/dlls/rpcrt4/tests/rpc.c > @@ -830,6 +830,20 @@ static void test_UuidCreate(void) > } > } > > +static void test_RpcServerUseProtseqEpEx(void) > +{ > + RPC_STATUS status; > + RPC_POLICY policy; > + static WCHAR protW[] = {'n','c','a','l','r','p','c',0}; > + > + policy.Length = sizeof( policy ); > + policy.EndpointFlags = 0; > + policy.NICFlags = 0; > + > + status = RpcServerUseProtseqEpExW(protW, 10, NULL, NULL, &policy); > + ok(status == RPC_S_OK, "Expected RPC_S_OK, got %d\n", status); > +} This is a good start, but you should also test the bindings created as a result of doing this and then you will probably discover that the fix to RpcServerUseProtseqEpExW isn't quite correct. > START_TEST( rpc ) > { > static unsigned char ncacn_np[] = "ncacn_np"; > @@ -849,4 +863,5 @@ START_TEST( rpc ) > test_endpoint_mapper(ncalrpc, NULL, lrpc_endpoint); > test_RpcStringBindingFromBinding(); > test_UuidCreate(); > + test_RpcServerUseProtseqEpEx(); > } -- Rob Shearman

2 2

DIB Engine - Patchset separated by original author
by Massimo Del Fedele 06 Feb '09

06 Feb '09

As asked to me, I have separated the dib engine into a patchset, trying to keep (when possible) the original author's submissions, so Huw Davies, Jesse Allen and me. I had to change some of other author's commits in order to fit my engine and to rebase it on 1.1.14, so I ask both previous authors to check if they agree on the patches. I hope this will help the review, as keeping it rebased on wine tree will become quite hard having it as a separated patchset. Attached here is a zipped patchset, which apply on wine 1.1.14. Ciao Max

4 4

re: gdiplus: Some tests for GdipGetLineRect
by Dan Kegel 06 Feb '09

06 Feb '09

Nikolay Sivov <bunglehead at gmail.com> wrote: > ... > + ok(rectf.X == 10.0, "Expected 10.0 got %.2f\n", rectf.X); Exact equality comparison on float is never a good idea in unit tests. You need a range test instead. See http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide#Floating-P…

1 0

Re: widl: filter_func isn't used when USE_COMPILER_EXCEPTIONS is defined
by Rob Shearman 06 Feb '09

06 Feb '09

2009/2/6 Christoph von Wittich <Christoph(a)apiviewer.de>: > diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c > index 0dcb737..88c0e53 100644 > --- a/tools/widl/proxy.c > +++ b/tools/widl/proxy.c > @@ -122,10 +122,12 @@ static void init_proxy(const statement_list_t *stmts) > print_proxy( " void *This;\n"); > print_proxy( "};\n"); > print_proxy( "\n"); > + print_proxy("#ifndef USE_COMPILER_EXCEPTIONS\n"); > print_proxy("static int __proxy_filter( struct __proxy_frame *__frame > )\n"); > print_proxy( "{\n"); > print_proxy( " return (__frame->_StubMsg.dwStubPhase != > PROXY_SENDRECEIVE);\n"); > print_proxy( "}\n"); > + print_proxy("#endif /* USE_COMPILER_EXCEPTIONS */\n"); > print_proxy( "\n"); > } I think a better solution to this would be to use proxy_filter as the expression in the RpcExcept statements. Alexandre, what do you think? -- Rob Shearman

2 1

[patch] rpcrt4_conn_np_read needs to expect and accept ERROR_MORE_DATA
by Luke Kenneth Casson Leighton 06 Feb '09

06 Feb '09

http://bugs.winehq.org/show_bug.cgi?id=17263 hooray! very simple fix, here - allow ERROR_MORE_DATA status code as an acceptable error. ... and _check it_, afterwards. ideally, the loop to read a complete PDU should be vaguely like this: do { RpcConnection conn->ops->read(data, &len) total_read += len; if GetLastError() == ERROR_MORE_DATA if total_read == total_packet_size return FALSE; /* not ok to return ERROR_MORE_DATA at end of PDU! } while (total_read != total_packet_size); i.e. you should _expect_ there to be an ERROR_MORE_DATA status code on all but the _very_ last bit of the PDU. but, you can't do that in rpcrt4_conn_np_read() because that function is just a "data getter", it doesn't know when it's being used to grab the last bit of the PDU. this will prove to be important for catching problems, both internally and also when SMBs are used. _yes_ the SMB system also returns ERROR_MORE_DATA. actually, if NT STATUS codes are enabled, it's STATUS_MORE_PROCESSING_REQUIRED which _do_ go over-the-wire if the smb server negotiates their use, but that's another story. l.

2 2

wine iexplore speed test (JavaScript)
by Detlef Riekenberg 06 Feb '09

06 Feb '09

I did a speed test for JS with Wine: ######################## http://v8.googlecode.com/svn/data/benchmarks/v3/run.html wine 17666004c839a40f1dbc5c98468557091bf3e13c Score: 48.5 Richards: 47.7 DeltaBlue: 56.3 Crypto: 32.1 RayTrace: 54.9 EarleyBoyer: 65.9 RegExp: 41.9 Same System, with Firefox 3.0.5: Score: 60.4 Richards: 65.8 DeltaBlue: 76.7 Crypto: 45.1 RayTrace: 53.7 EarleyBoyer: 96.5 RegExp: 41.2 Is there a way to use our jscript.dll instead of js3250.dll? Or a way to use js3250.dll in our jscript.dll? ################################### SunSpider does not show the results. http://www2.webkit.org/perf/sunspider-0.9/sunspider-driver.html I filled http://bugs.winehq.org/show_bug.cgi?id=17264 for that. -- By by ... Detlef

2 2

IPinImpl_QueryInternalConnections() is unused
by Francois Gouget 06 Feb '09

06 Feb '09

dlls/qcap/pin.c defines an IPinImpl_QueryInternalConnections() function but it is not actually used anywhere. Is there any reason to keep it? It sort of looks like IPin is a virtual class and that IPin::QueryInternalConnections() is going to be implemented in its descendents like VfwPin as is currently the case. But then VfwPin_QueryInternalConnections() is just as much of a stub so maybe it is it that should go away? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A polar bear is a cartesian bear after a coordinate transform.

2 1