wine-devel March 2009

wine-devel@winehq.org

136 participants
299 discussions

rpcrt4 <-> freedce conversion guide: functions and structures with direct equivalence
by Luke Kenneth Casson Leighton 01 Mar '09

01 Mar '09

i've started documenting and reviewing the functions and structures in wine's rpcrt4 implementation and providing direct equivalents, including the prototypes of each, in freedce. http://lkcl.net/software/msrpc_to_dcerpc i figured that if i was going to be saying "the two are equivalent" i might best actually be telling the truth :) so far, it looks like i'm about... 40% accurate: certainly 95% of the "public" functions (the ones with IDL files specifying them) are dead-on, with NDRCContext* and NDRSContext* being difficult to find equivalents (will look tomorrow), Mep* functions being _way_ out (10of), Ndr* presently difficult to track down (will look tomorrow), RpcServer* being 95% dead-on, RpcBinding* being 100% on, Uuid* is going to be dead-on, RpcAsync* being _way_ out, etc. etc. i left the Ndr marshalling functions (conformant, simple, etc) for now, will get to those later. these are just the public functions i'm evaluating (quantity 283 in rpcrt4.def) - there are behind-the-scenes implementations of the second-and-beyond layer APIs which are... well... is it actually worth evaluating them? that wasn't a rhetorical question. is it a worthwhile exercise to point out the equivalent functions, those that can be identified, between "internal" functions as found in rpcrt4, and those in freedce? e.g. struct connection_ops will have a direct equivalence somewhere in freedce (i'd start investigating ncklib/transport/cn/cninit.c, with rpc_prot_call_epv_t and other friends being likely candidates). the internal infrastructure in freedce is just... _incredible_. everything's subdivided down into clean interfaces behind vector tables, such that it's an incredibly trivial task to add a new transport or a new authentication module. i dropped in uxd_naf (unix domain sockets network address family) really easily - the interface for adding network address families (towers, aka sockaddr types) is clearly laid out. the transports are subdivided into dg (datagram) and cn (connection) so if you want to add a datagram transport, you know which set of 25 functions to implement, and likewise for a connection-orientated transport. remember - people have been dropping dce/rpc on top of ncacn_http, direct onto netbios datagrams and netbios sessions, decnet, osi networking, _goodness_ knows what else, and dropping in kerberos authentication, nt domains authentication - the works. you would do well to consider taking at the very least the transport infrastructure and the authentication infrastructure from freedce and just dropping it in. i've already added ncacn_np - on top of _real_ NamedPipes - for the Win32 port of freedce. l.

1 0

Re: twain_32/tests: Link with twain_32.dll.
by Jeremy White 01 Mar '09

01 Mar '09

Francois Gouget wrote: > --- > > winetest can detect if twain_32.dll is there or not, and if it's missing > there's nothing to test anyway. Note that make_makefiles will need to be > run. This patch breaks make crosstest for me: [apevia:~/w/wine/dlls/twain_32/tests] make crosstest i586-mingw32msvc-gcc dsm.cross.o testlist.cross.o -o twain_32_crosstest.exe -L../../../dlls -L../../../dlls/twain_32 -L../../../dlls/user32 -L../../../dlls/gdi32 -L../../../dlls/kernel32 -ltwain_32 -luser32 -lgdi32 -lkernel32 /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/bin/ld: cannot find -ltwain_32 collect2: ld returned 1 exit status make: *** [twain_32_crosstest.exe] Error 1 (it also breaks make test for me, but that may be operator error). But, what's more, I do not see the point. Twain_32 is not a Microsoft DLL; it is not present by default on most Windows systems. Further, the API specifications are quite clear: you're supposed to LoadLibrary Twain32, and all Twain applications I've tested do so. I don't see the benefit in making our test behave differently than the recommended behavior for this DLL. Cheers, Jeremy

3 2

Re: rpcrt4: Check for null endpoint in RpcServerUseProtseqEpExW
by Luke Kenneth Casson Leighton 01 Mar '09

01 Mar '09

see implementation in dual BSD-licensed _and_ LGPL-licensed freedce reference implementation, on which MSRPC was originally blatantly copied (thanks to the BSD license on the 1.0 reference implementation). e.g. online annotated copy here: http://www.sfr-fresh.com/linux/misc/freedce-1.1.0.7.tar.gz:a/freedce-1.1.0.… line 2470. anyone who is doing wine dce/rpc development _really_ needs to be looking at the reference implementation, side-by-side, line-for-line, in virtually every aspect except for exception handling, threading, binary-interoperability with the typelibraries and a few other areas. l.

3 3

winetricks does not reset service pack number correctly
by Fabian Köster 01 Mar '09

01 Mar '09

I just noticed that, when testing Lexware[1] with wine, that winetricks does not seem to reset the windows version correctly (or at least the Service Pack Number). On a fresh wine-installation I executed: winetricks msxml3 jet40 mdac28 dotnet20 When I now start the Lexware-Installer it says that "SP4" is installed (so it seems to be the setting for Windows 2000), but winecfg shows "Windows XP". When I run winetricks winxp afterwards, the installer correctly displays "SP2". Tested winetricks 20090227 with wine 1.1.16 Regards, Fabian [1] http://appdb.winehq.org/objectManager.php?sClass=application&iId=5505

3 3

Re: mshtml/tests: Fix SysFreeString call with wrong variable.
by Austin English 01 Mar '09

01 Mar '09

On Sun, Mar 1, 2009 at 7:11 AM, Rico Schüller <kgbricola(a)web.de> wrote: > Hi, > > this patch frees the correct variable and solves a regression in > mshtml/tests/dom.c (see > http://test.winehq.org/data/0d7bec3578e02e1f551813e86100b59e36aec542/#group… > ). > > Cheers > Rico > > --- > dlls/mshtml/tests/dom.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > > > Also fixes the test when run under WINEDEBUG=+heap. -- -Austin

1 0

Codeweavers logo
by Yann Leretaille 01 Mar '09

01 Mar '09

Hi, the Codeweavers-logo at the bottom of the page looks grainy and pixelated. I suggest using this version: download <http://yann.sciency.net/cw_logo_sm.png> Here a comparison of booth versions: Yann Leretaille ///**Text-Only**/// Hi, the codeweavers-logo at the bottom auf thee page looks grainy and pixelated. I suggest using this version: http://yann.sciency.net/cw_logo_sm.png Here a comparison of booth: http://yann.sciency.net/cw_old_new.png Yann Leretaille

1 0

storing the registry key class name to make PDFXChange-Viewer happy
by Patrick 01 Mar '09

01 Mar '09

Dear Developpers of Wine I like wine and I like Tracker Software's PDFXChange-Viewer as well. http://www.docu-track.com/home/prod_user/PDF-XChange_Tools/pdfx_viewer So, today I was not getting any rest until i found out why these two won't work together nicely. I mean they DO, actually. But I'm kind of touchy. I was wondering all the time, why most of the settings I changed were not restored as I exited and restarted the app. I then discovered that if wineserver was preserved ("-p" option) beween restarts they WERE restored. Further investigations unveiled that the problem is triggered by the fact that wineserver is not storing the registry key class name attributes. Something M$ must have come up with in XP but that is not very wideley used. PDFXChange-Viewer however seems to rely on it when parsing it's preferences from the registry on startup. Wineservers unicode string handling gave me a though time in implementing a solution to this but i finally managed. You can see that I went quiet straightforward: adding the class name next to the key name in the {system,user}.reg files. There are two different versions of the fix. I would prefer the second one because it preserves backwards compatibility: In case the key class attribute is set, it is put in brackets between the key name and modification time. Otherwise nothing changes. It would be really nice if this could be somehow integrated into wine. (Not only because I worked on it for a whole day, but also because i really miss the feature because i don't want to reconfigure PDFXChange-Viewer every time i start it and also because I would like to make that functionality available to all of my friends and all linux users as well. Greets Patrick [Software\\Tracker Software\\PDFViewer\\FullScreen\\MainView\\Bars\\0011;ParamItem] 1235760987 "Break"=dword:00000001 "ID"=dword:000081c9 "Name"="Properties" [Software\\Tracker Software\\PDFViewer\\FullScreen\\MainView\\Bars\\0011] [ParamItem] 1235761189 "Break"=dword:00000001 "ID"=dword:000081c9 "Name"="Properties" --- registry.c 2009-02-27 19:44:14.000000000 +0100 +++ registry.PP1.c 2009-02-27 19:49:03.000000000 +0100 @@ -176,7 +176,7 @@ dump_path( key->parent, base, f ); fprintf( f, "\\\\" ); } - dump_strW( key->name, key->namelen / sizeof(WCHAR), f, "[]" ); + dump_strW( key->name, key->namelen / sizeof(WCHAR), f, "[;" ); } /* dump a value to a text file */ @@ -245,6 +245,8 @@ { fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); + fprintf( f, ";" ); + dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "[]" ); fprintf( f, "] %ld\n", (long)key->modif ); for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f ); } @@ -1108,20 +1110,22 @@ int prefix_len, struct file_load_info *info, int default_modif ) { - WCHAR *p; - struct unicode_str name; - int res, modif; - data_size_t len; + WCHAR *p, cls[256]; + struct unicode_str name, class; + int res, res2, modif; + data_size_t len, len2 = 256; if (!get_file_tmp_space( info, strlen(buffer) * sizeof(WCHAR) )) return NULL; len = info->tmplen; - if ((res = parse_strW( info->tmp, &len, buffer, ']' )) == -1) + if ((res = parse_strW( info->tmp, &len, buffer, ';' )) == -1 || + (res2 = parse_strW( cls, &len2, buffer+res, ']' ) == -1)) { file_read_error( "Malformed key", info ); return NULL; } - if (sscanf( buffer + res, " %d", &modif ) != 1) modif = default_modif; + + if (sscanf( buffer + res + res2, " %d", &modif ) != 1) modif = default_modif; p = info->tmp; while (prefix_len && *p) { if (*p++ == '\\') prefix_len--; } @@ -1138,7 +1142,10 @@ } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); - return create_key( base, &name, NULL, flags, modif, &res ); + class.str = cls; + class.len = len2 - sizeof(WCHAR); + + return create_key( base, &name, &class, flags, modif, &res ); } /* parse a comma-separated list of hex digits */ --- registry.c 2009-02-27 19:44:14.000000000 +0100 +++ registry.PP2.c 2009-02-27 19:59:28.000000000 +0100 @@ -245,6 +245,10 @@ { fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); + if (key->class != NULL) { + fprintf( f, "] [" ); + dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "[]" ); + } fprintf( f, "] %ld\n", (long)key->modif ); for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f ); } @@ -1108,10 +1112,10 @@ int prefix_len, struct file_load_info *info, int default_modif ) { - WCHAR *p; - struct unicode_str name; - int res, modif; - data_size_t len; + WCHAR *p, *c; + struct unicode_str name, class; + int res, c_res, modif; + data_size_t len, c_len; if (!get_file_tmp_space( info, strlen(buffer) * sizeof(WCHAR) )) return NULL; @@ -1121,6 +1125,23 @@ file_read_error( "Malformed key", info ); return NULL; } + + c_len = info->tmplen - len; + if ((c_res = parse_strW( info->tmp + len / sizeof(WCHAR), &c_len, buffer + res, ']' )) == -1) + { + class.len = 0; + } + else + { + res += c_res; + + c = info->tmp + len / sizeof(WCHAR); + while (*c) { if (*c++ == '[') break; } + + class.str = c; + class.len = c_len - (c - (info->tmp + len / sizeof(WCHAR)) + 1) * sizeof(WCHAR); + } + if (sscanf( buffer + res, " %d", &modif ) != 1) modif = default_modif; p = info->tmp; @@ -1138,6 +1159,9 @@ } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); + + if (class.len > 0) + return create_key( base, &name, &class, flags, modif, &res ); return create_key( base, &name, NULL, flags, modif, &res ); }

2 3

mshtml/tests: Fix SysFreeString call with wrong variable.
by Rico Schüller 01 Mar '09

01 Mar '09

Hi, I'd like to have some feedback, before I send this to wine-patches. This patch removes a regression in the mshtml test, where the wrong variable is called by SysFreeString, which leads sometimes to a crash ( http://test.winehq.org/data/0d7bec3578e02e1f551813e86100b59e36aec542/#group… ). Is this fix correct? A second problem is there a need to call SysFreeString() after each IHTMLStyle_get* when a variable isn't used any more because it does a Sys*AllocString* call (in get_nsstyle_attr)? Or is this call useless and automatically done when the app is terminated? Cheers Rico --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1

Re: [2/2] mshtml: Implement IHTMLElement2_insertAdjecentElement (try 2)
by Alistair Leslie-Hughes 01 Mar '09

01 Mar '09

Hi, Can I get some feedback on please? Best Regards Alistair Leslie-Hughes "Alistair Leslie-Hughes" <leslie_alistair(a)hotmail.com> wrote in message news:49A7AF90.8000805@hotmail.com... > Hi, > Moved forward declare to private header. > > Changelog: > mshtml: Implement IHTMLElement2_insertAdjecentElement > > Best Regards > Alistair Leslie-Hughes > > > > -------------------------------------------------------------------------------- > >From afef95a87e49096a1fb26cb85a73463fcf5e5560 Mon Sep 17 00:00:00 2001 > From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Date: Thu, 19 Feb 2009 20:30:21 +1100 > Subject: [PATCH] Implement IHTMLElement2_insertAdjecentElement > To: wine-patches <wine-patches(a)winehq.org> > > --- > dlls/mshtml/htmlelem.c | 2 +- > dlls/mshtml/htmlelem2.c | 13 +++++++++++-- > dlls/mshtml/htmlnode.c | 3 +-- > dlls/mshtml/mshtml_private.h | 3 +++ > 4 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c > index 7d9a244..0b5cff7 100644 > --- a/dlls/mshtml/htmlelem.c > +++ b/dlls/mshtml/htmlelem.c > @@ -920,7 +920,7 @@ static HRESULT WINAPI > HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) > return E_NOTIMPL; > } > > -static HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR > where, nsIDOMNode *nsnode, > +HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, > nsIDOMNode *nsnode, > IHTMLElement **inserted) > { > static const WCHAR wszBeforeBegin[] = > {'b','e','f','o','r','e','B','e','g','i','n',0}; > diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c > index 3e22155..8007dc0 100644 > --- a/dlls/mshtml/htmlelem2.c > +++ b/dlls/mshtml/htmlelem2.c > @@ -912,8 +912,17 @@ static HRESULT WINAPI > HTMLElement2_insertAdjecentElement(IHTMLElement2 *iface, B > IHTMLElement *insertedElement, IHTMLElement **inserted) > { > HTMLElement *This = HTMLELEM2_THIS(iface); > - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(where), insertedElement, > inserted); > - return E_NOTIMPL; > + HTMLDOMNode *node_ins; > + > + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(where), insertedElement, > inserted); > + > + node_ins = get_node_obj(This->node.doc, (IUnknown*)insertedElement); > + if(!node_ins) { > + ERR("invalid insertedElement\n"); > + return E_INVALIDARG; > + } > + > + return HTMLElement_InsertAdjacentNode(This, where, node_ins->nsnode, > inserted); > } > > static HRESULT WINAPI HTMLElement2_applyElement(IHTMLElement2 *iface, > IHTMLElement *apply, > diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c > index bee0376..7d5ccb7 100644 > --- a/dlls/mshtml/htmlnode.c > +++ b/dlls/mshtml/htmlnode.c > @@ -32,7 +32,6 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(mshtml); > > -static HTMLDOMNode *get_node_obj(HTMLDocument*,IUnknown*); > > typedef struct { > DispatchEx dispex; > @@ -937,7 +936,7 @@ HTMLDOMNode *get_node(HTMLDocument *This, nsIDOMNode > *nsnode, BOOL create) > * We should use better way for getting node object (like private > interface) > * or avoid it at all. > */ > -static HTMLDOMNode *get_node_obj(HTMLDocument *This, IUnknown *iface) > +HTMLDOMNode *get_node_obj(HTMLDocument *This, IUnknown *iface) > { > HTMLDOMNode *iter = This->nodes; > IHTMLDOMNode *node; > diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h > index b67c485..37c3fcc 100644 > --- a/dlls/mshtml/mshtml_private.h > +++ b/dlls/mshtml/mshtml_private.h > @@ -777,3 +777,6 @@ static inline char *heap_strdupWtoA(LPCWSTR str) > HINSTANCE get_shdoclc(void); > > extern HINSTANCE hInst; > +HTMLDOMNode *get_node_obj(HTMLDocument*,IUnknown*); > +HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, > nsIDOMNode *nsnode, > + IHTMLElement **inserted); > -- > 1.5.4.3 > > -------------------------------------------------------------------------------- > >

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2009