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

Appdatabase racing and flightsim category
by Keith Muir 04 Aug '09

04 Aug '09

I submitted a list of flight sims for this category to Ken Sharp I notice the category has been updated with racing games but not flight anyone know what he did with my list Regards, Keith A-10 Aces high Air Attack Air warrrior II B-17 Flying Fortress Commanche 4 Condor Desert Fighters Enemy Engaged European Air War F-22 F-22 Lightning 3 F/A-18 Korea F/A-18 Operation Desert Storm F/A-18 PSF F16 Multi Role Fighter F22 Lightning 2 Falcon 4.0 Allied force Fighter Ace Fighter Squadron, Screaming Demons over Europe Flanker 2 Fly II Freespace 2 Gunship IL2 Sturmovik Independence war Independence war 2 Joint Strike Fighter - JSF jane's F-15 Janes FA-18 Janes's fighters anthology Janes's USAF LOMAC or lock on modern air combat Longbow 2 Micro Flight Mig 29 Fulcrum Pacific Fighters Red Baron 3D Red Baron II Rowan's Battle of Britain Sierra ProPilot Strike Fighters: Project 1 Tom Clancy's H.A.W. U.S. Navy Fighters Warbirds Warbirds 3

8 9

Re: cmd: add initial ipconfig
by Juan Lang 04 Aug '09

04 Aug '09

Hi Andre, ipconfig isn't a built-in command, as far as I know, it's a standalone utility (ipconfig.exe.) --Juan

1 0

Interesting find with cppcheck..
by chris ahrendt 04 Aug '09

04 Aug '09

I was working on something else and using cppcheck to make sure I was not having a memory leak and so forth and decided to try it on wine here is what is the results of the wine git tree : [../wine-git/dlls/crypt32/rootstore.c:346]: (error) Resource leak: dir [../wine-git/dlls/msvcrt/tests/file.c:997]: (error) Resource leak: stream1 [../wine-git/dlls/msvcrt/tests/file.c:997]: (error) Resource leak: stream4 [../wine-git/dlls/msvcrt/tests/heap.c:424]: (error) Deallocating a deallocated pointer: mem [../wine-git/dlls/ntdll/server.c:802]: (error) Resource leak: fd [../wine-git/tools/fnt2bdf.c:219]: (error) Resource leak: fp [../wine-git/tools/fnt2bdf.c:653]: (error) Resource leak: fd [../wine-git/tools/fnt2fon.c:304]: (error) Memory leak: file_lens [../wine-git/tools/widl/write_msft.c:2540]: (error) Deallocating a deallocated pointer: fd [../wine-git/tools/winebuild/res16.c:187]: (error) Resource leak: fd [../wine-git/tools/winedump/pe.c:1549]: (error) Memory leak: map Not sure if I need to write up a bug for this or what... and no I cant touch the code due to NDA issues. Chris

3 2

Re: Make the tests of the value returned from function SHGetFileInfoA more strick, fix wine to pass the tests
by Alexandre Julliard 04 Aug '09

04 Aug '09

Stefan Leichter <Stefan.Leichter(a)camline.com> writes: > While looking for bug 7701 i found that the function __vbaNew2 of the > MSVBVM60.dll does not like return values from SHGetFileInfoA bigger than > 0x7fff. > > Checking the return values on windows 2000 an XP > (http://www.winehq.org/pipermail/wine-devel/2009-July/077589.html) turned out > that it is always 1 on success (as long as SHGFI_EXETYPE is not specified). You need to take SHGFI_SYSICONINDEX into account too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: user32: Always overwrite dialog's saved focus handle
by Alexandre Julliard 04 Aug '09

04 Aug '09

Andrew Eikum <aeikum(a)codeweavers.com> writes: > This fixes a problem with dialogs which would cause > controls no longer on the current dialog screen to > regain focus. This doesn't look right, please write test cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/4] advapi32: Factor out lookup of local usernames and well-known SIDs.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Hans Leidekker <hans(a)codeweavers.com> writes: > Another attempt to fix the dotnet30 installer, using LSA_UNICODE_STRING > throughout this time. You are still assuming in some places that the string is null-terminated. -- Alexandre Julliard julliard(a)winehq.org

1 0

How should we handle Mac users visiting winehq.org?
by Scott Ritchie 04 Aug '09

04 Aug '09

Something interesting I noticed today: our wiki page on Mac OSX is ranked 7th when doing a simple search for "Wine" (the main page and the download page of winehq are 1st and 2nd). This means that a _large_ number of people are linking directly to the wiki page from external sites. Presumably, this is due to demand, however it's also largely due to the fact that the OSX experience on the main website is so poor. For instance, if I am a Mac user and I go to the website, I may learn what Wine is, get excited about it, and even read that it's for the Mac. But then I go to the download page and I'm completely lost - we don't put an OSX icon there, and we don't even explain that Crossover is for the Mac as well. My suggestion is we do our best to explain the current situation to Mac users. Provide an Apple "download" that actually links to the wiki page, and have the wiki be up front about how it's harder to install Wine on OS X than Linux because we don't have a volunteer making binary packages. Maybe some will take the hint and go buy Crossover, maybe some will go ahead and try the instructions but get less frustrated, and maybe someone will step forward and provide packages. At the moment, though, we leave them confused until Google tells them to go to the wiki page. Thanks, Scott Ritchie

2 1

More winehq.org improvements and issues: About page now links to articles in the wiki
by Scott Ritchie 04 Aug '09

04 Aug '09

I have begun some cleanup of the website, starting with the most popular pages. In particular, the about page: http://www.winehq.org/about/ The text is much easier to read for a newcomer to get a general overview of the project. On a wide browser window, however, it looks very horizontal -- this is fixable with a good picture on the right side of the screen, however I don't have one ready yet. It's kind of hard to capture what Wine is about for a typical user in a single picture, but I think it may be doable. Regardless, for users who want more information, the About page now directly links to 4 separate wiki articles: - Why Wine is so important - Common Myths about Wine - History of the Wine Project - Organization and Leadership I'll be personally giving each of these an edit over the coming weeks, however help is of course appreciated - that's why it's in the wiki. The last article, in particular, needs to be essentially written from scratch. Thanks for your help, especially Newman for committing my patches ;) Thanks, Scott Ritchie

5 5

New Wine Gecko 1.0.0 RC
by Jacek Caban 04 Aug '09

04 Aug '09

Hi, It's time for the new Wine Gecko package release. I've prepared a new package based on Mozilla code a bit newer than Firefox 3.5 and my fixes (most of them are on their way to mainstream Mozilla repository). This release fixes a few known bugs. It's not as big change as 0.9.0 release was, so I don't expect that many problems. Last time we had a few serious regressions and I'd like to avoid them now. That's why I'd like to ask you for help in testing (last time I did too, but somehow we've missed serious problems). To use it, just apply the attached patch, download the build from: http://gerwazy.lo3.wroc.pl/~jcaban/wine/wine_gecko-1.0.0.cab and place it in correct location according to (note s/0.9.1/1.0.0/): http://wiki.winehq.org/Gecko Everything that uses MSHTML is interesting for testing. Please let me know about any regression. If everything goes well, I will do the release on Monday next week. Thanks, Jacek commit 63e1e5a530b27b2bbd1795a418e618b1d4692235 Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 18:00:53 2009 +0200 Wine Gecko 1.0.0 release. diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 0cbfc06..d181458 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -44,6 +44,69 @@ typedef struct { #define HTMLBODY(x) (&(x)->lpHTMLBodyElementVtbl) +static const WCHAR aquaW[] = {'a','q','u','a',0}; +static const WCHAR blackW[] = {'b','l','a','c','k',0}; +static const WCHAR blueW[] = {'b','l','u','e',0}; +static const WCHAR fuchsiaW[] = {'f','u','s','h','s','i','a',0}; +static const WCHAR grayW[] = {'g','r','a','y',0}; +static const WCHAR greenW[] = {'g','r','e','e','n',0}; +static const WCHAR limeW[] = {'l','i','m','e',0}; +static const WCHAR maroonW[] = {'m','a','r','o','o','n',0}; +static const WCHAR navyW[] = {'n','a','v','y',0}; +static const WCHAR oliveW[] = {'o','l','i','v','e',0}; +static const WCHAR purpleW[] = {'p','u','r','p','l','e',0}; +static const WCHAR redW[] = {'r','e','d',0}; +static const WCHAR silverW[] = {'s','i','l','v','e','r',0}; +static const WCHAR tealW[] = {'t','e','a','l',0}; +static const WCHAR whiteW[] = {'w','h','i','t','e',0}; +static const WCHAR yellowW[] = {'y','e','l','l','o','w',0}; + +static const struct { + LPCWSTR keyword; + const WCHAR hexstr[8]; +} keyword_table[] = { + {aquaW, {'#','0','0','f','f','f','f',0}}, + {blackW, {'#','0','0','0','0','0','0',0}}, + {blueW, {'#','0','0','0','0','f','f',0}}, + {fuchsiaW, {'#','f','f','0','0','f','f',0}}, + {grayW, {'#','8','0','8','0','8','0',0}}, + {greenW, {'#','0','0','8','0','0','0',0}}, + {limeW, {'#','0','0','f','f','0','0',0}}, + {maroonW, {'#','8','0','0','0','0','0',0}}, + {navyW, {'#','0','0','0','0','8','0',0}}, + {oliveW, {'#','8','0','8','0','0','0',0}}, + {purpleW, {'#','8','0','0','0','8','0',0}}, + {redW, {'#','f','f','0','0','0','0',0}}, + {silverW, {'#','c','0','c','0','c','0',0}}, + {tealW, {'#','0','0','8','0','8','0',0}}, + {whiteW, {'#','f','f','f','f','f','f',0}}, + {yellowW, {'#','f','f','f','f','0','0',0}} +}; + +static BSTR nscolor_to_str(LPCWSTR color) +{ + int i, r, min = 0, max = sizeof(keyword_table)/sizeof(keyword_table[0])-1; + + if(!color || *color == '#') + return SysAllocString(color); + + while(min <= max) { + i = (min+max)/2; + + r = strcmpiW(color, keyword_table[i].keyword); + if(!r) + return SysAllocString(keyword_table[i].hexstr); + + if(r < 0) + max = i-1; + else + min = i+1; + } + + WARN("unknown color %s\n", debugstr_w(color)); + return SysAllocString(color); +} + static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) { switch(V_VT(v)) { @@ -305,7 +368,7 @@ static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIA nsAString_GetData(&strColor, &color); V_VT(p) = VT_BSTR; - V_BSTR(p) = SysAllocString(color); + V_BSTR(p) = nscolor_to_str(color); nsAString_Finish(&strColor); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index ab9649c..6060a8d 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -412,6 +412,11 @@ static void NSAPI nsDocumentObserver_CharacterDataChanged(nsIDocumentObserver *i { } +static void NSAPI nsDocumentObserver_AttributeWillChange(nsIDocumentObserver *iface, nsIDocument *aDocument, + nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType) +{ +} + static void NSAPI nsDocumentObserver_AttributeChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask) { @@ -563,6 +568,7 @@ static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = { nsDocumentObserver_Release, nsDocumentObserver_CharacterDataWillChange, nsDocumentObserver_CharacterDataChanged, + nsDocumentObserver_AttributeWillChange, nsDocumentObserver_AttributeChanged, nsDocumentObserver_ContentAppended, nsDocumentObserver_ContentInserted, diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 894bb41..24c6214 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -23,7 +23,7 @@ * compatible with XPCOM, usable in C code. */ -cpp_quote("#define GECKO_VERSION \"0.9.1\"") +cpp_quote("#define GECKO_VERSION \"1.0.0\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; @@ -855,7 +855,7 @@ interface nsIDOMDocument : nsIDOMNode [ object, - uuid(533a8131-8d0c-4ebf-990b-7fad7cd51466), + uuid(09a439ad-4079-46d5-a050-4d7015d1a108), local /* NOT_FROZEN */ ] @@ -868,9 +868,9 @@ interface nsIDOMNSDocument : nsISupports nsresult GetTitle(nsAString *aTitle); nsresult SetTitle(const nsAString *aTitle); nsresult GetContentType(nsAString *aContentType); + nsresult GetReadyState(nsAString *aReadyState); nsresult GetLastModified(nsAString *aLastModified); nsresult GetReferrer(nsAString *aReferrer); - nsresult GetBoxObjectFor(nsIDOMElement *elt, nsIBoxObject **_retval); nsresult HasFocus(PRBool *_retval); nsresult GetActiveElement(nsIDOMElement **aActiveElement); nsresult GetElementsByClassName(const nsAString *classes, nsIDOMNodeList **_retval); @@ -1546,13 +1546,13 @@ interface nsIWebNavigation : nsISupports [ object, - uuid(5af07661-6477-4235-8814-4a45215855b8), + uuid(343700dd-078b-42b6-a809-b9c1d7e951d0), local /* NOT_FROZEN */ ] interface nsIPrintSettings : nsISupports { - typedef struct { char dummy; } nsMargin; + typedef struct { char dummy; } nsIntMargin; nsresult SetPrintOptions(PRInt32 aType, PRBool aTurnOnOff); nsresult GetPrintOptions(PRInt32 aType, PRBool *_retval); @@ -1672,13 +1672,13 @@ interface nsIPrintSettings : nsISupports nsresult SetIsInitializedFromPrinter(PRBool aIsInitializedFromPrinter); nsresult GetIsInitializedFromPrefs(PRBool *aIsInitializedFromPrefs); nsresult SetIsInitializedFromPrefs(PRBool aIsInitializedFromPrefs); - nsresult SetMarginInTwips(nsMargin *aMargin); - nsresult SetEdgeInTwips(nsMargin *aEdge); - nsresult GetMarginInTwips(nsMargin *aMargin); - nsresult GetEdgeInTwips(nsMargin *aEdge); + nsresult SetMarginInTwips(nsIntMargin *aMargin); + nsresult SetEdgeInTwips(nsIntMargin *aEdge); + nsresult GetMarginInTwips(nsIntMargin *aMargin); + nsresult GetEdgeInTwips(nsIntMargin *aEdge); nsresult SetupSilentPrinting(); - nsresult SetUnwriteableMarginInTwips(nsMargin *aEdge); - nsresult GetUnwriteableMarginInTwips(nsMargin *aEdge); + nsresult SetUnwriteableMarginInTwips(nsIntMargin *aEdge); + nsresult GetUnwriteableMarginInTwips(nsIntMargin *aEdge); } [ @@ -1872,7 +1872,7 @@ interface nsIIOService : nsISupports [ object, - uuid(57322c6f-f4ec-4e46-8253-b74be220de16), + uuid(a50d5516-5c0a-4f08-b427-703ca0c44ac3), local, /* NOT_FROZEN */ ] @@ -2485,7 +2485,7 @@ interface nsIHTMLEditor : nsISupports [ object, - uuid(32e68316-67d4-44a5-8d35-0d390fa9df11), + uuid(365d600b-868a-452a-8de8-f46fad8fee53), local /* NOT_FROZEN */ ] @@ -2495,6 +2495,8 @@ interface nsIMutationObserver : nsISupports void /*CharacterDataChangeInfo*/ *aInfo); void CharacterDataChanged(nsIDocument *aDocument, nsIContent *aContent, void /*CharacterDataChangeInfo*/ *aInfo); + void AttributeWillChange(nsIDocument *aDocument, nsIContent * aContent, PRInt32 aNameSpaceID, + nsIAtom *aAttribute, PRInt32 aModType); void AttributeChanged(nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask); void ContentAppended(nsIDocument *aDocument, nsIContent *aContainer, PRInt32 aNewIndexInContainer); @@ -2531,7 +2533,7 @@ interface nsIDocumentObserver : nsIMutationObserver void StyleRuleAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); void StyleRuleRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); void BindToDocument(nsIDocument *aDocument, nsIContent *aContent); - void DoneAddingContent(nsIContent *aContent, PRBool aHaveNotified); + void DoneAddingChildren(nsIContent *aContent, PRBool aHaveNotified); } /* diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a122e0c..3af8867 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -583,9 +583,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); } - if(This->nscontainer) - set_ns_editmode(This->nscontainer); - update_doc(This, UPDATE_UI); if(This->mon) { @@ -609,6 +606,9 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(FAILED(hres)) return hres; + if(This->nscontainer) + set_ns_editmode(This->nscontainer); + if(This->ui_active) { RECT rcBorderWidths; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a153a14..557a789 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2991,7 +2991,6 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_margin(style, &str); ok(hres == S_OK, "get_margin failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(str, "1px"), "margin = %s\n", dbgstr_w(str)); hres = IHTMLStyle_put_margin(style, NULL);

5 4

Re: [2/4] advapi32: Add a basic implementation of LsaLookupNames2.
by Nikolay Sivov 04 Aug '09

04 Aug '09

Hans Leidekker wrote: > diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c > index 315cce9..edb20d8 100644 > --- a/dlls/advapi32/lsa.c > +++ b/dlls/advapi32/lsa.c > @@ -297,19 +297,88 @@ NTSTATUS WINAPI LsaLookupNames( > return STATUS_NONE_MAPPED; > } > > +static BOOL lookup_name(LSA_UNICODE_STRING *name, SID *sid, DWORD *sid_size, WCHAR *domain, > + DWORD *domain_size, SID_NAME_USE *use, BOOL *handled) > +{ > + BOOL ret; > + > + ret = lookup_local_wellknown_name(name, sid, sid_size, domain, domain_size, use, handled); > + if (!handled) > + ret = lookup_local_user_name(name, sid, sid_size, domain, domain_size, use, handled); > + > + return ret; > +} > This looks strange. Shouldn't be " if (!*handled) " or " if (!ret) "?

1 0