wine-devel July 2009

wine-devel@winehq.org

116 participants
249 discussions

search path redux - if office 2007 always uses a private riched20, why does wine interpose its own global one?
by Dan Kegel 18 Oct '09

18 Oct '09

See http://bugs.winehq.org/show_bug.cgi?id=14980 Essentially, to run Office 2007, you have to set an override for riched20. Since Office installs a new, spiffier version of riched20 in its own private directory, and expects to find it there, isn't it a bug that we don't let it have it? Sounds like it's time to write a conformance test... sure would be nice if that override wasn't needed.

9 26

re: Wine t-shirts?
by Dan Kegel 03 Sep '09

03 Sep '09

Maarten wrote: > Why don't we have wine t-shirts any more? I dunno, where were they before? I just looked, couldn't find any on cafepress.com. I'd like to bring back the Codeweavers drunken penguin t-shirts, perhaps with a slightly more generic Wine design. Coincidentally, I found some site on the net had taken the logo from that shirt and erased the Crossover logo from the wine bottle; here's a cleaned-up copy: http://kegel.com/wine/wine-penguin-corkscrew.png

15 34

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

15 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);

2 6

DxDiag Demo Patch
by Allen Hair 15 Aug '09

15 Aug '09

Hello Wine Developers, Over the last couple of months I have been part of a team of students at UCLA who have been developing an implementation of the DxDiag application to release with Wine. After a long quarter, we have produced a working implementation. Some of the features are still missing but most of the functionality has been completed. I hope that our work proves useful to the Wine project. Attached is a patch that will add our code to the source tree. This patch is not meant to be committed, but should provide a demonstration of the application so far. Any feedback would be appreciated, I will try to incorporate any suggestions as I work on releasing incremental patches over the next few weeks. - Allen Hair

6 7

How to test cryptui's dialogs?
by Aurimas Fišeras 10 Aug '09

10 Aug '09

Hello, I've finished translating cryptui's resources, checked control sizes with resource editor and adjusted them where it was needed. But how can I run cryptui's wizards and other dialogs to confirm that everything else is translated correctly?

6 21

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

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

04 Aug '09

5 4

Cursor & Icon patches
by Daniel Santos 03 Aug '09

03 Aug '09

Hello everybody! Attached is my current cursor icon patches based upon work by Henri Verbeet and Andrew Riedi for review and comment. I finished the actual code about 3 weeks ago, but it's been a lot of work for me to split it out into smaller pieces, especially being new to git. Here is a break-down of what these patches do and the theory. * Adds real 32-bit handles (instead of converting 16-bit handles to 32 bit). * Cursors & icons stored in non-moveable memory block (a.k.a., "32 bit data") in addition to existing 16-bit moveable block. * A new 'struct cursor_header' (include/wine/winuser16.h) is pre-pended to the 32-bit cursor/icon data (16-bit data format is untouched). * A new 'struct cursor_map_entry' (dlls/user32/cursoricon.c) is used to manage a cursor's association with its handles and data. * Adds more complete .ani support (I think nearly 100% complete). * Adds themed icon support (from your X-windows theme). * Fixes a lot of bugs. * And finally, moves cursors to the server. The server opaquely stores the raw 32-bit cursor/icon data. Since the client does all interaction with winex11.drv, the server doesn't really need to understand it. The client caches all objects locally, but attempts to retrieve from the server any handle it doesn't know about. Locally, the client uses a pair of rbtrees to associate cursor objects (actually struct cursor_map_entry) with their respective 16 & 32 bit handles. The 16 bit cursor data is automatically generated on the client and can still be directly manipulated from 16 bit programs; in such cases, the 32-bit cursor data will be updated from the modified 16 bit data. The CRITICAL_SECTION IconCrst is used to synchronize access to the rbtrees and ensure that data is unmodified once an operation on that data begins (in database terms, IconCrst is used to lock the entire "table" and there's no "row-level" locking). There are several new functions to query and manipulate the rbtrees: add_cursor_entry : (self-explanatory) remove_cursor_entry: (self-explanatory) get_cursor_handle16: retrieves a 16-bit handle from a 32-bit one get_cursor_handle : visa-versa Layered on top of that are a basic set of functions for higher level management of cursor/icon objects: alloc_cursor_data : allocate & initialize cursor data & header create_cursor : creates cursor and auto-generates 16-bit data destroy_cursor : destroys cursor and associated 16-bit data get_cursor_entry : will look both locally and on the server get_cursor_object : returns the cursor's data update_cursor_data16: creates or updates the 16-bit data from 32-bit data CURSORICON_refresh_cursor16: updates the 32-bit data from 16-bit data The functions add_cursor_entry and get_cursor_entry directly return a pointer to the struct cursor_map_entry and therefore require locking IconCrst in advance of calling (or will fail an assertion). Having direct access to the cursor_map_entry reduces complexity in some circumstances. One of the oddest fixes is the fake_cursor() function, which is used to accommodate deleting the active cursor, which windows doesn't mind. This isn't the only way to go about it, but the alternative was to make the cursor empty and I'm not certain that that is the visual behavior of windows when deleting the active cursor, so I'm more than open to feedback on that as well as anything else in these patches. Thanks! Daniel

5 7

AppDB - Watchtower Library as Nr. 1 Top-10 Platinum application
by Groeschel, Volker 02 Aug '09

02 Aug '09

This looks like a manipulation for me. How is this calculated? http://appdb.winehq.org/ <http://dict.leo.org/ende?lp=ende&p=thMx..&search=manipulation>

3 2

How far away are we from .net 3.0 install working?
by Dan Kegel 01 Aug '09

01 Aug '09

http://www.winehq.org/pipermail/wine-patches/2009-June/074701.html says that the offline installer for .net 3.0 works fine with that one patch, but it didn't seem to work when I tried it. Anyone know what the story is? - Dan

4 7

Jump to page:

2025

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 July 2009