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

Re: advapi32: SetEntriesInAclW() should accept account name "CURRENT_USER".
by Rob Shearman Aug. 18, 2009

Aug. 18, 2009

2009/8/16 Rein Klazes <wijn(a)online.nl>: > @@ -3510,7 +3511,8 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, > DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]); > DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; > SID_NAME_USE use; > - if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) > + if ( strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER ) && What will the memory pointed to by ppsid[i] be set to in this case? Hint: whatever the memory was last used for, not the SID of the current user which is what is desired. > + !LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) > { > WARN("bad user name %s for trustee %d\n", debugstr_w(pEntries[i].Trustee.ptstrName), i); > ret = ERROR_INVALID_PARAMETER; -- Rob Shearman

1 0

Re: msxml3: Support loading windows file path under wine (try 2 - Resend)
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Hi, > Stopped converting the filename to Unicode. Obviously you still need to convert for opening it. -- Alexandre Julliard julliard(a)winehq.org

1 0

mp3 update
by Aric Stewart Aug. 18, 2009

Aug. 18, 2009

Hello all, I am working on updating our winemp3.acm implementation to a modern libmpg123. We where at about 0.59r and I have 1.8.1 working very well. I have a few questions. Right now I have the smallest subset of files from libmpg123 that are needed to compile and work in the wine framework (mostly) unmodified. I have replaced all the malloc/free calls with HeapAlloc/HeapFree and worked in all the wine debugging code instead of the libmpg123 debugging code. What I am wondering about is that there is still a lot of code in these files we have no interest in. The file reader and http reader and other things that we do not use (it is accessed just by the direct stream methods) and those things dependencies. Should I leave all this code present in our version of the modules and mostly preserve the libmpg123 work to make it easier to keep updating forward? Or should i remove all the unneeded code so that the modules present in winehq are leaner and more targeted to just the things the wine needs, but then they deviate much more from the original libmpg123 source? With what I have now the mp3 source material this game i am testing is using sounds much much better. So it should be a great improvement. Thanks, -aric

11 27

add new application attrib.exe
by EA Durbin Aug. 18, 2009

Aug. 18, 2009

This fixes bug 18059. If this one is not acceptable, feel free to take it and clean it up, I am abandoning this effort from here forward. _________________________________________________________________ Windows Live: Keep your friends up to date with what you do online. http://windowslive.com/Campaign/SocialNetworking?ocid=PID23285::T:WLMTAGL:O…

1 0

Re: [7/10] windowscodecs: implement CopyPixels for GIF decoder (resend 2)
by Vincent Povirk Aug. 17, 2009

Aug. 17, 2009

Wait, no, this one's wrong too. Don't commit it. It's correct for odd heights but not even heights. To calculate the number of rows divisible by N, I have to divide the 0-based index of the maximum row by N and add 1 (for the ever-present row 0). However, I divided the height, which is maximum row+1. To do this correctly, I would have to do (height-1)/N+1 or the equivalent (height+(N-1))/N. I'll fix it tomorow. On Mon, Aug 17, 2009 at 3:49 PM, Vincent Povirk<vincent(a)codeweavers.com> wrote: > This time with correct interlacing code in the patch that is attached. > > > > -- Vincent Povirk

1 0

Re: gdiplus: Implement GdipIsVisibleRect
by Andrew Eikum Aug. 17, 2009

Aug. 17, 2009

Andrew Eikum wrote: > --- > dlls/gdiplus/gdiplus.spec | 2 +- > dlls/gdiplus/graphics.c | 47 +++++++++-- > dlls/gdiplus/tests/graphics.c | 180 > +++++++++++++++++++++++++++++++++++++++++ > include/gdiplusflat.h | 2 + > 4 files changed, 221 insertions(+), 10 deletions(-) > > > > ------------------------------------------------------------------------ > > Don't apply. I just found out these should call GdipIsVisibleRegion*. Will fix shortly.

1 0

Re: [7/10] windowscodecs: implement CopyPixels for GIF decoder (resend)
by Reece Dunn Aug. 17, 2009

Aug. 17, 2009

2009/8/17 Vincent Povirk <vincent(a)codeweavers.com>: > This time with correct interlacing code. Patch?

1 0

Re: [13/18] wpp: Add wpp_set_exit_on_error function
by Juan Lang Aug. 17, 2009

Aug. 17, 2009

Hi Matteo, this approach seems pretty inflexible to me: +/* Whether to exit the app on errors (default: true) */ +extern void wpp_set_exit_on_error( int exit ); @@ -646,7 +654,8 @@ int ppy_error(const char *s, ...) va_start(ap, s); generic_msg(s, "Error", ppy_text, ap); va_end(ap); - exit(1); + if(pp_status.exit_on_error) exit(1); + else pp_status.state = 1; return 1; } It seems as though you might instead have a global error function that should be called, which defaults to exit(). In fact, that's what ppy_error seems to be. So I think you'd want to make ppy_error into a function pointer, and make the current definition its default value, or something like that. I can't imagine that retaining the output to stderr is all that useful in the context of the D3D9 shader assembler. You could further split this patch: this is half of it, setting and dealing with the exit_on_error flag. The other half deals with the current assumption that ppy_error never returns. You can make removing that assumption one patch, and this--changing the error function to something else--a subsequent patch. --Juan

2 1

Re: [7/10] windowscodecs: implement CopyPixels for GIF decoder
by Vincent Povirk Aug. 17, 2009

Aug. 17, 2009

Don't commit this. I screwed up the interlacing. On Mon, Aug 17, 2009 at 2:01 PM, Vincent Povirk<vincent(a)codeweavers.com> wrote: > > > > > > -- Vincent Povirk

1 0

Re: mshtml: Implement OmNavigator_get_appName
by Jacek Caban Aug. 17, 2009

Aug. 17, 2009

Hi Vladimir, Vladimir Pankratov wrote: > Hello all. > > Implemented OmNavigator_get_appName. Please add a test. Jacek

1 0

Re: [1/18] d3dx9: Add shader assembler private definitions
by Stefan Dösinger Aug. 17, 2009

Aug. 17, 2009

Am Sunday 16 August 2009 19:50:54 schrieb Matteo Bruni: > This is a long patch series that implements the D3D shader assembler > and D3DXAssembleShader function. The first part has already passed a > couple of rounds of review in wine-devel. The patches look ok for applying to me. I didn't look deeply at the later patches yet(no time), and will look later. The base structure seems ok, I know earlier versions of the ASM code, and if there are some smaller issues they can be fixed incrementally. Its probably easier to discuss and fix them(if there are any) once the base code is in. Its a new feature, so it shouldn't cause any regressions.

1 0

Re: [PATCH 6/6] wined3d: Make RTL_READTEX the default rendertarget locking method.
by Stefan Dösinger Aug. 17, 2009

Aug. 17, 2009

Am Friday 14 August 2009 09:23:25 schrieb Henri Verbeet: > For most cards this should make more sense than RTL_READDRAW, even if e.g. > surface_upload_data() has some room for improvement. I don't think this is a good idea until the READDRAW code has the ability to only upload a part of the surface if a limited rectangle was locked > --- > dlls/wined3d/surface.c | 1 - > dlls/wined3d/wined3d_main.c | 2 +- > dlls/wined3d/wined3d_private.h | 1 - > 3 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index 29ad00d..781a6b2 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -1518,7 +1518,6 @@ static HRESULT WINAPI > IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { > IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial > texture loading not supported yet */); /* drop through */ > > - case RTL_AUTO: > case RTL_READDRAW: > IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, > fullsurface ? NULL : &This->dirtyRect); break; > diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c > index 881f90e..4feb509 100644 > --- a/dlls/wined3d/wined3d_main.c > +++ b/dlls/wined3d/wined3d_main.c > @@ -41,7 +41,7 @@ wined3d_settings_t wined3d_settings = > PS_HW, /* Hardware by default */ > TRUE, /* Use of GLSL enabled by default */ > ORM_FBO, /* Use FBOs to do offscreen rendering */ > - RTL_AUTO, /* Automatically determine best locking method */ > + RTL_READTEX, /* Default render target locking method */ > PCI_VENDOR_NONE,/* PCI Vendor ID */ > PCI_DEVICE_NONE,/* PCI Device ID */ > 0, /* The default of memory is set in FillGLCaps */ > diff --git a/dlls/wined3d/wined3d_private.h > b/dlls/wined3d/wined3d_private.h index 8df99f6..5f88afd 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -267,7 +267,6 @@ static inline float float_24_to_32(DWORD in) > #define SHADER_NONE 4 > > #define RTL_DISABLE -1 > -#define RTL_AUTO 0 > #define RTL_READDRAW 1 > #define RTL_READTEX 2

3 5

Regression Testing 0.9.60/0.9.61
by James McKenzie Aug. 17, 2009

Aug. 17, 2009

Looks like a patch to 0.9.61 broke the EM_FORMATRANGE patch that I was working on. I've received guidance from Dylan Smith on how to redo the patch and I will once I get the old patch working with 1.0. Guidance on how to use git to run bisect tests would be appreciated. Do I get the commit numbers from the Tag messages that AJ sends? James McKenzie

3 3

Re: winecfg: Let the user specify the drive letter of a to be added drive.
by Austin English Aug. 16, 2009

Aug. 16, 2009

On Sun, Aug 16, 2009 at 1:12 PM, Rein Klazes<wijn(a)online.nl> wrote: > fixes bug#14728 > --- > programs/winecfg/Bg.rc | 10 +++++++++ > programs/winecfg/Cs.rc | 10 +++++++++ > programs/winecfg/Da.rc | 10 +++++++++ > programs/winecfg/De.rc | 10 +++++++++ > programs/winecfg/En.rc | 10 +++++++++ > programs/winecfg/Es.rc | 10 +++++++++ > programs/winecfg/Fi.rc | 10 +++++++++ > programs/winecfg/Fr.rc | 10 +++++++++ > programs/winecfg/Hu.rc | 10 +++++++++ > programs/winecfg/It.rc | 10 +++++++++ > programs/winecfg/Ja.rc | 10 +++++++++ > programs/winecfg/Ko.rc | 10 +++++++++ > programs/winecfg/Lt.rc | 10 +++++++++ > programs/winecfg/Nl.rc | 10 +++++++++ > programs/winecfg/No.rc | 10 +++++++++ > programs/winecfg/Pl.rc | 10 +++++++++ > programs/winecfg/Pt.rc | 20 +++++++++++++++++ > programs/winecfg/Ro.rc | 10 +++++++++ > programs/winecfg/Ru.rc | 10 +++++++++ > programs/winecfg/Si.rc | 10 +++++++++ > programs/winecfg/Sv.rc | 10 +++++++++ > programs/winecfg/Tr.rc | 10 +++++++++ > programs/winecfg/Zh.rc | 20 +++++++++++++++++ > programs/winecfg/driveui.c | 48 ++++++++++++++++++++++++++++++++++++++++++- > programs/winecfg/resource.h | 2 + > 25 files changed, 299 insertions(+), 1 deletions(-) > > diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc > index fcdf895..8ac2c67 100644 > --- a/programs/winecfg/Bg.rc > +++ b/programs/winecfg/Bg.rc > @@ -128,6 +128,16 @@ BEGIN > PUSHBUTTON "Îòìåíè",IDCANCEL,77,74,45,14,WS_GROUP > END > > +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 > +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU > +CAPTION "Select Drive Letter" > +FONT 8, "MS Shell Dlg" Howdy Rein, I don't believe you're supposed to add English resources to non-English rc files. The dialog will automatically fall back to English if not present. It messes up the translation stats.. -- -Austin

3 2

When do regressions become high priority for developers?
by Matt Perry Aug. 16, 2009

Aug. 16, 2009

When do regressions become high priority for developers? I ask because I opened bug 13583 over 14 months ago, provided all the information requested, as did other people, and nothing has happened. The program worked with Wine 0.9.53 but has been broken since then. I have continued to test the program on newer versions of Wine occasionally, but the bug persists. In fact, I am starting to see more regressions in recent Wine builds that prevent me from getting to the point in the program where I can test the regression reported in the bug report. 14 months seems to be more than reasonable to repair a regression. I'm worried about having to forever maintain a separate installation of Wine just to use this program. I'll be happy to test further if someone is going to work on this bug but right now my efforts seem to be for naught. Should I bother to continue to give this bug any attention or just abandon it and focus my efforts elsewhere? Matt

5 4

Appinstall testing guide up on the wiki
by Austin English Aug. 16, 2009

Aug. 16, 2009

Howdy all, James asked me to put up a guide for testing applications with Appinstall. It's on the wiki (which seems to be down at the moment) at http:/wiki.winehq.org/Appinstall_Testing. I had a couple people read over it to make sure I didn't miss anything obvious (or omit stuff that seems obvious to me). If you've got a few minutes and want to write a test for your favorite downloadable application, give it a try. AutoHotKey is pretty simple to pick up, and basic tests (e.g., making sure app launches and doesn't crash) is pretty simple to write. Send me your tests and I'll add them to the test suite. If anything in the guide is unclear, please let me know and I'll update it. If everything looks good, I'll e-mail wine-users, so users can test their favorite apps. For those who haven't followed, Appinstall is my Summer of Code project to automate application testing using AutoHotKey + a wrapper shell script. It handles the process of automatically downloading, running, verifying and testing various applications under Wine, against previously verified Windows behavior. It can test for regressions of popular applications/features, as well as making sure bugs aren't subtly fixed. The wrapper script handles fresh WINEPREFIX's, winetricks dependencies, timeouts of runaway/hung tests, and parsing of the output logs. Source is at http://winezeug.googlecode.com/svn/trunk/appinstall/ -- -Austin

4 5

Re: add spanish resource taskmgr
by lats Aug. 16, 2009

Aug. 16, 2009

On 16/08/09 09:33, José Francisco Facundo Pérez wrote: When sending to wine-patches, please don't cc: wine-devel but set the Reply-To to wine-devel(a)winehq.org

1 0

Re: attrib.exe[2/4] add usage function
by Jeff Zaroyko Aug. 16, 2009

Aug. 16, 2009

On Sun, Aug 16, 2009 at 2:12 PM, EA Durbin<ead1234(a)hotmail.com> wrote: > > > ________________________________ > Windows Live™: Keep your life in sync. Check it out. > > > Hi EA I posted these comments on bugzilla before I also saw that you submitted the patchset: in patch 2, you should just use one call to printf or just puts, one call per line is not necessary, just do as such: printf("foo\n" "bar\n" "baz\n"); Why does the usage function return 1? I see that you propagate it as the return value on incorrect usage, attrib.exe still returns 0 on Windows if you give an invalid option: C:\Users\jeffz>attrib +J foo Invalid switch - +J C:\Users\jeffz>echo %ERRORLEVEL% 0 -Jeff

1 0

re: When do regressions become high priority for developers?
by Dan Kegel Aug. 15, 2009

Aug. 15, 2009

Matt Perry wrote: > When do regressions become high priority for developers? > [SecureCRT broke with wine-0.9.54, > http://bugs.winehq.org/show_bug.cgi?id=13583 ] > 14 months seems to be more than reasonable to repair a regression. That's a tough question. Note that Photoshop CS3 installer has been busted for months, and is in a similar limbo. (We even know how to fix it, but nobody has time at the moment.) Often people will fix regressions that pop up after their changes. In this case, the developer is no longer around. Also, this regression might be a 'we exposed a hole in wine' rather than a plain old bug, so the fix might mean writing a bunch of new code. In this case, the previous version of the app works under Wine, so perhaps that makes a fix less urgent. Sometimes it helps to attract the attention of the app's developer. I'll ping them and see what they say, maybe they can tell us where we're going wrong. Occasionally one of the true hotshots (like AF) will take an interest and diagnose the cause. That makes it a lot easier to fix, the cost to fix the bug becomes much less uncertain, and if some company needs the app to work, a paid fix becomes more affordable at that point. But even with that, sometimes it's ages before the bug bubbles up to the top of anyone's priorities. I wish I had a better answer for you! - Dan

2 1

New Wine Gecko 1.0.0 RC
by Jacek Caban Aug. 15, 2009

Aug. 15, 2009

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

Re: d3d10: Add annotation skipping.
by Henri Verbeet Aug. 15, 2009

Aug. 15, 2009

2009/8/15 Rico Schüller <kgbricola(a)web.de>: > +static inline void parse_annotation(const char **ptr, unsigned int count) > +{ > + unsigned int i; > + DWORD d[3]; > + > + if(count == 0) return; > + > + FIXME("Skipping %#x annotation(s):\n", count); > + for (i = 0; i < count; ++i) > + { > + read_dword(ptr, &d[0]); > + read_dword(ptr, &d[1]); > + read_dword(ptr, &d[2]); > + FIXME("\t0x%08x 0x%08x 0x%08x\n", d[0], d[1], d[2]); > + } > +} Please try to stick to the general structure of the other parsing functions. I.e., something like this: static void parse_fx10_annotation(const char **ptr) { skip_dword_unknown(ptr, 3); } and { unsigned int i; ... read_dword(ptr, &p->annotation_count); for (i = 0; i < p->annotation_count; ++i) { parse_fx10_annotation(ptr); } ... }

2 1

Writing Conformance Tests
by Mike Aug. 15, 2009

Aug. 15, 2009

Being new to wine, I was thinking about starting to learn the system by writing conformance tests. Most of us do NOT have access to machines of every flavor of Windows. Is there a standard method to deal with differences across platforms? I realize that often, this won't be an issue, but was wondering what (if any) the practice is for write across platforms without access to these platforms. Thanks, Mikey

2 1

Re: [8/21] comctl32: Add basic structure for IImageList interface
by Nikolay Sivov Aug. 15, 2009

Aug. 15, 2009

Owen Rudge wrote: > --- > dlls/comctl32/imagelist.c | 318 > ++++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 317 insertions(+), 1 deletions(-) Hi. +/************************************************************************* + * IImageList implementation + */ + +typedef struct { + const IImageListVtbl *lpVtbl; + LONG ref; + HIMAGELIST hImageList; +} ImageListImpl; + You can't do that. HIMAGELIST should be the same thing as IImageList. See here: 1) from commctrl.h --- #ifdef __cplusplus FORCEINLINE HIMAGELIST IImageListToHIMAGELIST(struct IImageList *himl) { return reinterpret_cast<HIMAGELIST>(himl); } #else #define IImageListToHIMAGELIST(himl) ((HIMAGELIST)(himl)) #endif --- 2) SHGetImageList docs from http://msdn.microsoft.com/en-us/library/bb762185%28VS.85%29.aspx ---* Remarks* The *IImageList* pointer type, such as that returned in the /ppv/ parameter, can be cast as an HIMAGELIST as needed; for example, for use in a list view. Conversely, an HIMAGELIST can be cast as a pointer to an *IImageList.* ---

3 5

New winetricks 20090815: new verbs directplay, openwatcom, dotnet30
by Dan Kegel Aug. 15, 2009

Aug. 15, 2009

Another fortnight, another winetricks. Main changes are Solaris portability improvements, more verbs support silent install, and three new verbs: directplay will be handy for those couple dozen networked games that use that API. dotnet30 probably isn't ready for prime time, but it's there for testing. openwatcom is handy for those of us working on the win16 test suite. Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com (Bug reports to the issue tracker at the above URL, please.) Changes since 20090716: r634 | daniel.r.kegel | 2009-08-15 02:22:33 -0700 (Sat, 15 Aug 2009) | 12 lines Improve error dialog to use kde or gnome's dialog program as appropriate (important since Sun doesn't ship xmessage!) and check ownership of .winetrickscache Thanks to Matt Lewandowsky for this patch. Also fix cabextract and unzip tests to show an error dialog in gui case and fix dogui() to not explode if WINETRICKS_TMP doesn't exist yet r633 | austinenglish | 2009-08-14 09:22:45 -0700 (Fri, 14 Aug 2009) | 1 line add OpenWatcom verb r632 | austinenglish | 2009-08-14 09:20:32 -0700 (Fri, 14 Aug 2009) | 1 line ie6 can install silently too r631 | daniel.r.kegel | 2009-08-14 07:07:15 -0700 (Fri, 14 Aug 2009) | 11 lines Use die for showing the "you don't own" error, so gui users can see it Check WINEPREFIX rather than HOME if appropriate (based on a patch by Matt Lewandowsky) r629 | daniel.r.kegel | 2009-08-13 00:01:49 -0700 (Thu, 13 Aug 2009) | 4 lines Don't use test -O, as it's not present on older systems. Based on a patch by Matt Lewandowsky r628 | daniel.r.kegel | 2009-08-12 22:58:10 -0700 (Wed, 12 Aug 2009) | 4 lines Patch from Matt Lewandowsky to work on systems with classic tar instead of gnu tar (i.e. old solaris). r622 | austinenglish | 2009-08-10 19:06:28 -0700 (Mon, 10 Aug 2009) | 2 lines add directplay for Windows 98 (from Directx9) (Patch by Hugh Perkins) r619 | daniel.r.kegel | 2009-08-08 15:34:47 -0700 (Sat, 08 Aug 2009) | 4 lines Different workaround for Samyak problems (see Focht's dotnet20 appdb entry). Patch from Austin, lightly tweaked. r618 | daniel.r.kegel | 2009-08-08 15:25:26 -0700 (Sat, 08 Aug 2009) | 2 lines Update to handle new gecko. (Patch from Austin, with a few tweaks by me.) r615 | daniel.r.kegel | 2009-08-08 07:10:41 -0700 (Sat, 08 Aug 2009) | 3 lines added dotnet30. (Install finishes with current wine; haven't tried running any apps yet.) r613 | austinenglish | 2009-08-07 15:08:12 -0700 (Fri, 07 Aug 2009) | 2 lines make more installers silent, if possible. Adjust winetrickstest to match r605 | austinenglish | 2009-08-01 10:55:56 -0700 (Sat, 01 Aug 2009) | 2 lines update sha1sums/broken urls

1 0

DxDiag Demo Patch
by Allen Hair Aug. 15, 2009

Aug. 15, 2009

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