March 2009 - Wine-Devel - list.winehq.org

Re: mshtml/tests: Fix SysFreeString call with wrong variable.

by Austin English

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

March 1, 2009

Codeweavers logo

by Yann Leretaille

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

March 1, 2009

Re: winetricks does not reset service pack number correctly

by Vitaliy Margolen

Fabian Köster wrote: > 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). Winetricks is not part of Wine. All bugs for it should be reported to: http://code.google.com/p/winezeug/issues/list Vitaliy.

March 1, 2009

Re: storing the registry key class name to make PDFXChange-Viewer happy

by Patrick

On Sam, 2009-02-28 at 19:04 -0600, Austin English wrote: > On Sat, Feb 28, 2009 at 7:04 PM, Austin English <austinenglish(a)gmail.com> wrote: > > On Sat, Feb 28, 2009 at 12:37 AM, Patrick <ragamuffin(a)datacomm.ch> wrote: > >> 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 ); > >> } > >> > >> > >> > >> > >> > >> > > > > Patches should be sent in git diff format to wine-patches(a)winehq.org. > > > > See http://wiki.winehq.org/Patching > > > > Thanks for helping Wine! > > > > -- > > -Austin > > > > Err, make that http://wiki.winehq.org/SubmittingPatches > Sorry, lenghty conformance tests & learning git would take me another day.... It's unlikely that I'll do that before Christmas 2010 or so... Thank you for the reply anyway! In case anybody wants to use the code - put it through the whole preocess - modify it or implement the idea in another way, he should feel free to do so. It's hereby set free from any license/copyright or other obstacles. You could even claim that you wrote it yourself ;-) I won't mind. Just get it into wine somehow. Patrick

March 1, 2009

winetricks does not reset service pack number correctly

by Fabian Köster

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

March 1, 2009

mshtml/tests: Fix SysFreeString call with wrong variable.

by Rico Schüller

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(-)

March 1, 2009

Re: mshtml/tests: Fix SysFreeString call with wrong variable.

by Jacek Caban

Rico Schüller wrote: > 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? Yes, it is. > > 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? It is not useless, although the memory is freed after app terminated, we should free it as soon as it's no longer needed. Thanks, Jacek

March 1, 2009

Re: [2/2] mshtml: Implement IHTMLElement2_insertAdjecentElement (try 2)

by Alistair Leslie-Hughes

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(a)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 > > -------------------------------------------------------------------------------- > >

March 1, 2009

CreateThread timing behaviour (Bug 15323 affecting Warhammer Online)

by Paul TBBle Hampson

I'm looking into Bug 15323, and it seems to come down to a particular undocumented behaviour of CreateThread on Windows, which is probably also a bug in the usage of it by warpatch.bin, the Warhammer Online patcher. Problem code outline: Main thread: flag = false; createThread( newThreadFun ) sleep until flag = false; newThreadFun: flag = true CreateHiddenWindowAndWaitForMessageFromMainThread; flag = false; return; On inspection, the only way this can work is if the main thread's "sleep until" test is done before newThreadFun gets started. And this is what we see. If the sleep is hit, the patcher never shows any windows or continues on. If the patcher works, we _never_ slept. I've attached a hack patch against kernel32's thread test suite which reduces it to a single test of this behaviour. Under Windows, the test always passes, at least in my limited testing. Under Wine, the test usually fails if wineserver is not already running, and usually passes if wineserver is already running. However, both cases can also give the opposite result every so often. This matches the observed problems starting the Warhammer Online patcher. So anyway, I guess the question is, am I right about this behaviour or have I overlooked something relevant? And the follow-up question, if this is a threading behaviour difference between Wine and MS Win32, should Wine replicate it? And then the follow-up to the follow-up... How would this be replicated? Maybe a new thread should start at a slightly lower priority than its parent thread? Or simply have ntdll/thread.c's start_thread call sched_yield(); before call_thread_func. I tried this last idea, and the test passed more often, but still failed frequently with no wineserver running. It also improved the chances of warpatch starting correctly (I only had one failure in about ten tries, rather than nine failures in ten tries). -- ----------------------------------------------------------- Paul "TBBle" Hampson, B.Sc, LPI, MCSE Very-later-year Asian Studies student, ANU The Boss, Bubblesworth Pty Ltd (ABN: 51 095 284 361) Paul.Hampson(a)Pobox.com Of course Pacman didn't influence us as kids. If it did, we'd be running around in darkened rooms, popping pills and listening to repetitive music. -- Kristian Wilson, Nintendo, Inc, 1989 License: http://creativecommons.org/licenses/by/2.5/au/ -----------------------------------------------------------

March 1, 2009

Re: storing the registry key class name to make PDFXChange-Viewer happy

by Austin English

On Sat, Feb 28, 2009 at 7:04 PM, Austin English <austinenglish(a)gmail.com> wrote: > On Sat, Feb 28, 2009 at 12:37 AM, Patrick <ragamuffin(a)datacomm.ch> wrote: >> 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 ); >> } >> >> >> >> >> >> > > Patches should be sent in git diff format to wine-patches(a)winehq.org. > > See http://wiki.winehq.org/Patching > > Thanks for helping Wine! > > -- > -Austin > Err, make that http://wiki.winehq.org/SubmittingPatches -- -Austin

March 1, 2009