December 2008 - Wine-Devel - list.winehq.org

Re: [1\3] setupapi: add CM_Locate_DevNodeA\W stubs
by Stefan Leichter Dec. 12, 2008

Dec. 12, 2008

Am Friday 12 December 2008 01:42 schrieb ricardo filipe: >--- a/dlls/setupapi/setupapi.spec >+++ b/dlls/setupapi/setupapi.spec >@@ -53,7 +53,7 @@ > @ stub CM_Free_Res_Des > @ stub CM_Free_Res_Des_Ex > @ stub CM_Free_Res_Des_Handle >-@ stub CM_Get_Child >+@ stdcall CM_Get_Child(ptr long long) > @ stub CM_Get_Child_Ex > @ stub CM_Get_Class_Key_NameA > @ stub CM_Get_Class_Key_NameW this part is wrong here as it is in the second patch too .. Stefan

2 1

Re: mshtml: Add some interfaces in mshtml.idl (try 2) (resend)
by Konstantin Kondratyuk Dec. 12, 2008

Dec. 12, 2008

On Thursday 11 December 2008 17:28:03 Konstantin Kondratyuk wrote: > Add: > ILineInfo > IDisplayPointer > IDisplayPointer > IHTMLComputedStyle > IDisplayServices > IMarkupServices This patch is wrong. Please, ignore it. -- Best regards, Konstantin Kondratyuk.

1 0

Re: winmm: Sign-compare warning fix (Resend)
by Andrew Talbot Dec. 12, 2008

Dec. 12, 2008

On Fri Dec 12 10:29 , Michael Stefaniuc <mstefani(a)redhat.com> sent: >Andrew Talbot wrote: >> But how would you then fix the sign-compare violation, or would you just let this >> one go? >I had to look twice as the initial warning was in a for loop above: >Either leave it as is for now as the warning is bogus or at least add >the decrement directly to the while like this: > i = sizeof(MMDrvs) / sizeof(MMDrvs[0]); > while (i-- > 0) > { > MMDRV_ExitPerType(&MMDrvs[i], MMDRV_AUX); > >Though the later would still have to pass Alexandre's review. > >bye > michael Come to think of it, I believe Alexandre did improve one of my earlier efforts in this latter way, so I might retry with the slimmer while loop you suggest. Thanks, Michael (and Chris and Peter)! -- Andy.

1 0

Re: A nicer icon for shell32 folder
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Hervÿffffe9 Chanal <chanal_herve(a)yahoo.fr> writes: > It's (may) be a nicer icon for the "folder icon" of shell32. comments are welcome. I think you should keep the yellow color scheme, that's what all other folder-style icons use. > Sorry for all the mess I seem to have done. I'll try to revert my old > icons patch to the previous ones as soon as I have the time. You haven't done any mess, the svg icons are a nice improvement. The reason they don't look as good as they should is because Wine doesn't support the alpha channel, we need to fix that. -- Alexandre Julliard julliard(a)winehq.org

4 3

Re: winmm: Sign-compare warning fix (Resend)
by Andrew Talbot Dec. 12, 2008

Dec. 12, 2008

On Fri Dec 12 0:58 , Michael Stefaniuc sent: >Andrew Talbot wrote: >> What is wrong with this patch, please? >If I may venture a guess: You have replaced a nice and concise for loop >into and ugly 4 line while loop. > >bye > michael > Hi Michael, Ugly? Andrew Koenig and Barbara Moo show a similar construct in their book "Accelerated C++". ;) But how would you then fix the sign-compare violation, or would you just let this one go? -- Andy.

4 3

Re: kernel32: Remove _hread16() as it is not used. Move _hwrite16() next to the other related functions.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Francois Gouget <fgouget(a)free.fr> writes: > The krnl386.exe.spec file points _hread() to WIN16_hread() so that this > _hread16() function is unused. > > The naming of these implementations is a bit inconsistent but it may not > be worth a patch to fix it (but if it is I'll gladly send one). The reason for the inconsistent naming is that the xxx16 functions are 16-bit implementations usable from normal Wine code, while the WIN16_xxx ones have different calling sequences and are for use by the relay code only. That's why we had both WIN16_hread and hread16. Of course at this point we shouldn't be calling 16-bit functions from Wine code, so it no longer matters. -- Alexandre Julliard julliard(a)winehq.org

1 0

Translating to winehq.org
by Maik Schulz Dec. 12, 2008

Dec. 12, 2008

Hi, I just started translating the new winehq.org to German. How would you like to receive the git patches for the translated template files? One at a time whenever I have them ready, or at the end in one batch? Also, what about obsolete content? E.g. contributing.template still lists Wine 1.x tasks (with a link to an empty Bugzilla list) as well as an empty Wine 0.9.x tasks list. Cheers, -Maik

3 2

Re: winmm: Sign-compare warning fix (Resend)
by Michael Stefaniuc Dec. 12, 2008

Dec. 12, 2008

Andrew Talbot wrote: > What is wrong with this patch, please? If I may venture a guess: You have replaced a nice and concise for loop into and ugly 4 line while loop. bye michael > --- > Changelog: > winmm: Sign-compare warning fix. > > diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c > index 794c117..946d0d0 100644 > --- a/dlls/winmm/lolvldrv.c > +++ b/dlls/winmm/lolvldrv.c > @@ -737,7 +737,7 @@ static BOOL MMDRV_ExitPerType(LPWINE_MM_DRIVER lpDrv, UINT type) > */ > void MMDRV_Exit(void) > { > - int i; > + unsigned int i; > TRACE("()\n"); > > for (i = 0; i < sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0]); i++) > @@ -753,8 +753,11 @@ void MMDRV_Exit(void) > } > > /* unload driver, in reverse order of loading */ > - for (i = sizeof(MMDrvs) / sizeof(MMDrvs[0]) - 1; i >= 0; i--) > + i = sizeof(MMDrvs) / sizeof(MMDrvs[0]); > + while (i > 0) > { > + --i; > + > MMDRV_ExitPerType(&MMDrvs[i], MMDRV_AUX); > MMDRV_ExitPerType(&MMDrvs[i], MMDRV_MIXER); > MMDRV_ExitPerType(&MMDrvs[i], MMDRV_MIDIIN); > > -- Michael Stefaniuc Tel.: +49-711-96437-199 Consulting Communications Engineer Fax.: +49-711-96437-111 -------------------------------------------------------------------- Reg. Adresse: Red Hat GmbH, Otto-Hahn-Strasse 20, 85609 Dornach bei Muenchen Handelsregister: Amtsgericht Muenchen HRB 153243 Geschäftsführer: Brendan Lane, Charlie Peters, Michael Cunningham, Werner Knoblich

1 0

compiling Windows code with g++ on Linux using msvcrt - good idea? if so, how do you do it?
by foobarbaz biffblaff Dec. 11, 2008

Dec. 11, 2008

Hi, I have a huge amount of Windows code that I'm porting to Linux. Wine is turning out to be a read godsend, thank you guys! Anyway, I've had tons of luck including the directory <wine_dir>/include/wine/windows in my include path. All my Windows types are there and everything is wonderful. I've even been able to link against the libraries by renaming, for example, foo.dll.so to libfoo.so and using -lfoo on the g++ command line. I actually haven't got all my functions defined so I don't know if this will actually run yet because the link isn't complete yet. My first question is whether this will work. Will all my Windows functions with function declarations defined in the windows directory and code compiled into foo.dll.so actually run? Second, I see that some of the functions I want to use are actually defined by headers in the msvcrt directory. However, this directory contains tons of header files that my system (and gcc) also have under /usr/include and gcc's own directories. I understand that msvcrt is Windows lib c, but I wonder how I'm supposed to use it with gcc to compile? I've tried -nostdinc to gcc, but the number of errors I get is enormous. It's not the end of the world if I can't use Wine's msvcrt, but if I could use it, it would define dozens more functions on which my program relies, or if its use was mandatory in order to get the functions implemented in foo.dll.so to work, then obviously I wonder how I'm supposed to compile my Windows code with Wine to make everything work? I'm sorry if this is a dumb question. I can't find a way to search the wine-devel mailing list other than with google and I can't find anything on there or other docs that answer this question, which I'm sure has been asked a million times and has a simple answer. Thank you thank you, Jeff _________________________________________________________________ Send e-mail faster without improving your typing skills. http://windowslive.com/Explore/hotmail?ocid=TXT_TAGLM_WL_hotmail_acq_speed_…

3 3

website : http://www.winehq.org/site/who gives a 404
by Paul Vriens Dec. 11, 2008

Dec. 11, 2008

Hi, Just noticed that the Who is Who page is still referenced (from http://www.winehq.org/acknowledgement for example) as being on winehq.org. Wasn't this moved to the wiki? -- Cheers, Paul.

3 3

Re: wintrust: Sign-compare warnings fix
by Juan Lang Dec. 11, 2008

Dec. 11, 2008

Hi Andy, - if (pbEncoded[1] + 1 > cbEncoded) + if (pbEncoded[1] + 1U > cbEncoded) Is this change necessary? The resulting code is less clear than the original, IMO. It's clearly a spurious warning: a BYTE (max value 255) + 1 can't yield a value that overflows an unsigned int, so this comparison will always do what's wanted. Same with the change here: - else if (lenLen + 2 > cbEncoded) + else if (lenLen + 2U > cbEncoded) Otherwise, this patch looks fine to me. --Juan

2 3

re: compiling Windows code with g++ on Linux using msvcrt - good idea? if so, how do you do it?
by Dan Kegel Dec. 11, 2008

Dec. 11, 2008

Glad Wine is being helpful to you. If you're targeting plain old 32 bit intel-compatible linux or unix, have you considered simply using wine to run your windows binaries? That plus a very few tweaks in your source tree could get you what you want with potentially less effort. - Dan

1 0

Re: German translation for winehq.org
by Jeremy Newman Dec. 11, 2008

Dec. 11, 2008

Excellent work! -Newman Maik Schulz wrote: > Hi, > > please find attached a patch for the beginning of a German translation > of the new winehq.org. More patches to follow as I go through the > remaining templates. > > Cheers, > -Maik > > > ------------------------------------------------------------------------ > >

1 0

RE: [2/4] WineD3D: Set up the shaders when delaying fixed func applying
by Stefan Dösinger Dec. 11, 2008

Dec. 11, 2008

Here's an updated patch that fixes the compile issues > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Stefan Dösinger > Sent: Thursday, December 11, 2008 11:53 AM > To: wine-patches(a)winehq.org > Subject: [2/4] WineD3D: Set up the shaders when delaying fixed func > applying > > I skipped the original 2/5 patch because I found a last minute bug in > it. It should not affect the other patches though. > > Just fyi, this is my roadmap for cleaning up the fog mess this patch is > related to: > 1) Get rid of the GL_EXT_fog_coord-is-not-supported fallback and fake > the GL extension > 2) Remove the different pixel shader fog start and end optimization(and > probably reintroduce it in a cleaner way once the state_fog function is > sane) > 3) Separate the current fog state block into > fogenable+fogvertexmode+fogtablemode and fogstart-fogend > 4) Move the separated fog states into the fragment pipeline(since GLSL > and ARBfp override fog) > 5) Put the fog mode into the ps_compile_args structure to generate > shaders that can disable fog properly and support exponential fog > 6) Find some way to deal with glFogi(GL_FOG_COORDINATE_SOURCE_EXT, ...). > That part still belongs into the vertex pipe I think. > 7) the optimization removed in (2) is only needed for GLSL. We can > easilly reintroduce it once we have a full GLSL pipeline because then > the fog start and end stays independent of the pixel shader.

1 0

RE: [2/5] wined3d: baseShader.functionLength should be 0 when a NULL pFunction is passed.
by Stefan Dösinger Dec. 11, 2008

Dec. 11, 2008

Do we still have a case where a shader is created with a NULL function? I think we filter that in d3d8 now and just create a vdecl > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Henri Verbeet > Sent: Thursday, December 11, 2008 11:58 AM > To: wine-patches(a)winehq.org > Subject: [2/5] wined3d: baseShader.functionLength should be 0 when a > NULL pFunction is passed. >

2 2

RE: [2/4] WineD3D: Set up the shaders when delaying fixed func applying
by Stefan Dösinger Dec. 11, 2008

Dec. 11, 2008

Don't apply this patch, it has a bug and will cause a compile error > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Stefan Dösinger > Sent: Thursday, December 11, 2008 11:53 AM > To: wine-patches(a)winehq.org > Subject: [2/4] WineD3D: Set up the shaders when delaying fixed func > applying > > I skipped the original 2/5 patch because I found a last minute bug in > it. It should not affect the other patches though. > > Just fyi, this is my roadmap for cleaning up the fog mess this patch is > related to: > 1) Get rid of the GL_EXT_fog_coord-is-not-supported fallback and fake > the GL extension > 2) Remove the different pixel shader fog start and end optimization(and > probably reintroduce it in a cleaner way once the state_fog function is > sane) > 3) Separate the current fog state block into > fogenable+fogvertexmode+fogtablemode and fogstart-fogend > 4) Move the separated fog states into the fragment pipeline(since GLSL > and ARBfp override fog) > 5) Put the fog mode into the ps_compile_args structure to generate > shaders that can disable fog properly and support exponential fog > 6) Find some way to deal with glFogi(GL_FOG_COORDINATE_SOURCE_EXT, ...). > That part still belongs into the vertex pipe I think. > 7) the optimization removed in (2) is only needed for GLSL. We can > easilly reintroduce it once we have a full GLSL pipeline because then > the fog start and end stays independent of the pixel shader.

1 0

Re: jscript: Implement multiple Math functions.
by Jacek Caban Dec. 11, 2008

Dec. 11, 2008

Hi Patrick, Patrick Rudolph wrote: > From 0903060f5acac3bcadc4198bd59eb2ef87f78818 Mon Sep 17 00:00:00 2001 > From: Patrick Rudolph <patrick1804(a)web.de> > Date: Wed, 10 Dec 2008 16:51:19 +0100 > Subject: jscript: Implement multiple Math functions. > > modified: math.c > modified: tests/api.js > --- > dlls/jscript/math.c | 293 +++++++++++++++++++++++++++++++++++++++------ > dlls/jscript/tests/api.js | 32 +++++ > 2 files changed, 287 insertions(+), 38 deletions(-) > > diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c > index e6b7202..56ba9cf 100644 > --- a/dlls/jscript/math.c > +++ b/dlls/jscript/math.c > @@ -20,6 +20,7 @@ > #include "wine/port.h" > > #include <math.h> > +#include <sys/time.h> > > #include "jscript.h" > > @@ -57,57 +58,105 @@ static const WCHAR tanW[] = {'t','a','n',0}; > static HRESULT Math_E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, > VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) > { > - FIXME("\n"); > - return E_NOTIMPL; > + if(arg_cnt(dp) > 0) { > + FIXME("invalid arg_cnt %d\n", arg_cnt(dp)); > + return E_NOTIMPL; > + } > + > + if(retv) > + num_set_val(retv, exp(1)); > + return S_OK; > } > It's a JavaScript constant, not a function (and you've implemented it as if it would be a function). The same for other constants. [...] Please send smaller patches, preferable one patch per function, and add more tests. And first of all, make sure that tests are correct... > diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js > index 2868c0f..6430397 100644 > --- a/dlls/jscript/tests/api.js > +++ b/dlls/jscript/tests/api.js > @@ -585,6 +585,38 @@ ok(tmp === 2, "Math.pow(2, 2) = " + tmp); > tmp = Math.pow(2, 2, 3); > ok(tmp === 4, "Math.pow(2, 2, 3) = " + tmp); > > +tmp = Math.PI(); > What makes you think this test will work? Jacek

1 0

Coverity Telco coming up
by Kai Blin Dec. 11, 2008

Dec. 11, 2008

Hi folks, Coverity is hosting a telco tomorrow about some new technology they're going to roll out to projects. I'm planning to attend, and would like to bring up any issues we're currently having in the Q&A session. Issues I'm currently seeing with our Coverity experience: - Adding new developers to the access list is painfully slow - Builds are pretty outdated (They seem to be working on this) Anything else? Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

5 5

(no subject)
by foobarbaz biffblaff Dec. 11, 2008

Dec. 11, 2008

Hi, I have a huge amount of Windows code that I'm porting to Linux. Wine is turning out to be a read godsend, thank you guys! Anyway, I've had tons of luck including the directory <wine_dir>/include/wine/windows in my include path. All my Windows types are there and everything is wonderful. I've even been able to link against the libraries by renaming, for example, foo.dll.so to libfoo.so and using -lfoo on the g++ command line. I actually haven't got all my functions defined so I don't know if this will actually run yet because the link isn't complete yet. My first question is whether this will work. Will all my Windows functions with function declarations defined in the windows directory and code compiled into foo.dll.so actually run? Second, I see that some of the functions I want to use are actually defined by headers in the msvcrt directory. However, this directory contains tons of header files that my system (and gcc) also have under /usr/include and gcc's own directories. I understand that msvcrt is Windows lib c, but I wonder how I'm supposed to use it with gcc to compile? I've tried -nostdinc to gcc, but the number of errors I get is enormous. It's not the end of the world if I can't use Wine's msvcrt, but if I could use it, it would define dozens more functions on which my program relies, or if its use was mandatory in order to get the functions implemented in foo.dll.so to work, then obviously I wonder how I'm supposed to compile my Windows code with Wine to make everything work? I'm sorry if this is a dumb question. I can't find a way to search the wine-devel mailing list other than with google and I can't find anything on there or other docs that answer this question, which I'm sure has been asked a million times and has a simple answer. Thank you thank you, Jeff _________________________________________________________________ Send e-mail faster without improving your typing skills. http://windowslive.com/Explore/hotmail?ocid=TXT_TAGLM_WL_hotmail_acq_speed_…

1 0

Re: wininet/tests: Use new test URLs on test.winehq.org.
by Paul Vriens Dec. 10, 2008

Dec. 10, 2008

Hi Alexandre, These changes introduce 15 errors on all platforms. -- Cheers, Paul.

1 0

Re: [PATCH 14/14] msi: Add tests for MsiGetProductProperty.
by Paul Vriens Dec. 10, 2008

Dec. 10, 2008

James Hawkins wrote: > --- > dlls/msi/tests/package.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 232 insertions(+), 0 deletions(-) > > > ------------------------------------------------------------------------ > > Hi James, These fail on Win9x as we are relying on some registry keys that are NT+ specific: 9574 lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); 9575 lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\"); 9576 lstrcatA(keypath, prod_squashed); Can we skip these tests, like we do with some others: scm = OpenSCManager(NULL, NULL, GENERIC_ALL); if (!scm && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("Different registry keys on Win9x and WinMe\n"); return; } -- Cheers, Paul.

2 1

Re: [5/8] jscript: Implement the String.anchor() method.
by Jacek Caban Dec. 10, 2008

Dec. 10, 2008

Hi Andrew, Andrew Nguyen wrote: > --- > dlls/jscript/string.c | 58 ++++++++++++++++++++++++++++++++++++++++++ > dlls/jscript/tests/api.js | 17 +++++++++++++ > 2 files changed, 73 insertions(+), 2 deletions(-) > +static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, const WCHAR *tagname, const WCHAR *attrname) +{ + static const WCHAR attrtagfmtW[] = {'<','%','s',' ','%','s','=','"','%','s','"','>','%','s','<','/','%','s','>',0}; + static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + StringInstance *string; + BSTR ret; + BSTR attrval = NULL; + DWORD len; + HRESULT hres = S_OK; + + TRACE("\n"); IMO it would be better to change FIXME to TRACE in String_anchor instead of adding TRACE here. You use this function in a few places, and this TRACE doesn't tell us, which function is called. + + if(!is_class(dispex, JSCLASS_STRING)) { + WARN("this is not a string object\n"); + hres = E_NOTIMPL; + goto cleanup; You may just return E_NOTIMPL here. + } + + string = (StringInstance*)dispex; + + if(retv) { + if(arg_cnt(dp)) { + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &attrval); You should call to_string even if retv is NULL. Although it looks like a nice optimization, we can't do this. Eg, if to_string throws exception, we have to throw it here. + if (FAILED(hres)) + goto cleanup; You may just return hres here. + } + + len = string->length + 2*strlenW(tagname) + strlenW(attrname) + 9; + + if (attrval) + len += SysStringLen(attrval); + else + len += sizeof(undefinedW)/sizeof(WCHAR) - 1; + + ret = SysAllocStringLen(NULL, len); + + if(!ret) + { + hres = E_OUTOFMEMORY; + goto cleanup; Perhaps it's just me, but in cases that don't make the code cleaner by using gotos, I'd avoid them. How about: if(ret) { sprintfW(ret, attrtagfmtW, tagname, attrname, (attrval ? attrval : undefinedW), string->str, tagname); V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; }else { hres = E_OUTOFMEMORY; } + } + + sprintfW(ret, attrtagfmtW, tagname, attrname, (attrval ? attrval : undefinedW), string->str, tagname); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + cleanup: + SysFreeString(attrval); + return hres; +} Jacek

1 0

Re: [5/8] jscript: Implement the String.anchor() method.
by Jacek Caban Dec. 10, 2008

Dec. 10, 2008

Hi Andrew, Andrew Nguyen wrote: > --- > dlls/jscript/string.c | 58 ++++++++++++++++++++++++++++++++++++++++++ > dlls/jscript/tests/api.js | 17 +++++++++++++ > 2 files changed, 73 insertions(+), 2 deletions(-) > +static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, const WCHAR *tagname, const WCHAR *attrname) +{ + static const WCHAR attrtagfmtW[] = {'<','%','s',' ','%','s','=','"','%','s','"','>','%','s','<','/','%','s','>',0}; + static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + StringInstance *string; + BSTR ret; + BSTR attrval = NULL; + DWORD len; + HRESULT hres = S_OK; + + TRACE("\n"); IMO it would be better to change FIXME to TRACE in String_anchor instead of adding TRACE here. You use this function in a few places, and this TRACE doesn't tell us, which function is called. + + if(!is_class(dispex, JSCLASS_STRING)) { + WARN("this is not a string object\n"); + hres = E_NOTIMPL; + goto cleanup; You may just return E_NOTIMPL here. + } + + string = (StringInstance*)dispex; + + if(retv) { + if(arg_cnt(dp)) { + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &attrval); You should call to_string even if retv is NULL. Although it looks like a nice optimization, we can't do this. Eg, if to_string throws exception, we have to throw it here. + if (FAILED(hres)) + goto cleanup; You may just return hres here. + } + + len = string->length + 2*strlenW(tagname) + strlenW(attrname) + 9; + + if (attrval) + len += SysStringLen(attrval); + else + len += sizeof(undefinedW)/sizeof(WCHAR) - 1; + + ret = SysAllocStringLen(NULL, len); + + if(!ret) + { + hres = E_OUTOFMEMORY; + goto cleanup; Perhaps it's just me, but in cases that don't make the code cleaner by using gotos, I'd avoid them. How about: if(ret) { sprintfW(ret, attrtagfmtW, tagname, attrname, (attrval ? attrval : undefinedW), string->str, tagname); V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; }else { hres = E_OUTOFMEMORY; } + } + + sprintfW(ret, attrtagfmtW, tagname, attrname, (attrval ? attrval : undefinedW), string->str, tagname); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + cleanup: + SysFreeString(attrval); + return hres; +}

1 0

Re: oleaut32: added PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture::Render with test (try3)
by Paul Vriens Dec. 10, 2008

Dec. 10, 2008

Nikolay Sivov wrote: > Changelog(try3): > - fixed identation in testlist > Changelog(try2): > - added PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture::Render with test > - added test for zero dimensions > > P.S. Render with this types spotted in traces of bugs 6799 and 10050 > >>From 3386e8674380390c3b60c6247443c605ffe6ff6a Mon Sep 17 00:00:00 2001 > From: Nikolay Sivov <bunglehead(a)gmail.com> > Date: Wed, 10 Dec 2008 13:41:09 +0300 > Subject: added PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture::Render > > --- > dlls/oleaut32/olepicture.c | 8 +++++ > dlls/oleaut32/tests/olepicture.c | 64 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 72 insertions(+), 0 deletions(-) > > diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c > index 498ee53..bdce729 100644 > --- a/dlls/oleaut32/olepicture.c > +++ b/dlls/oleaut32/olepicture.c > @@ -637,6 +637,10 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, > TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top, > prcWBounds->right, prcWBounds->bottom); > > + if(cx == 0 || cy == 0 || cxSrc == 0 || cySrc == 0){ > + return CTL_E_INVALIDPROPERTYVALUE; > + } > + > /* > * While the documentation suggests this to be here (or after rendering?) > * it does cause an endless recursion in my sample app. -MM 20010804 > @@ -644,6 +648,10 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, > */ > > switch(This->desc.picType) { > + case PICTYPE_UNINITIALIZED: > + case PICTYPE_NONE: > + /* nothing to do */ > + return S_OK; > case PICTYPE_BITMAP: > { > HBITMAP hbmpOld; > diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c > index f81c419..9e33121 100644 > --- a/dlls/oleaut32/tests/olepicture.c > +++ b/dlls/oleaut32/tests/olepicture.c > @@ -25,6 +25,7 @@ > #include <float.h> > > #define COBJMACROS > +#define NONAMELESSUNION > > #include "wine/test.h" > #include <windef.h> > @@ -587,6 +588,68 @@ static void test_enhmetafile(void) > GlobalFree(hglob); > } > > +static void test_Render(void) > +{ > + IPicture *pic; > + HRESULT hres; > + short type; > + PICTDESC desc; > + HDC hdc = GetDC(0); > + > + /* test IPicture::Render return code on uninitialized picture */ > + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); > + hres = IPicture_get_Type(pic, &type); > + ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); > + ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); > + /* zero dimensions */ > + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + /* nonzero dimensions, PICTYPE_UNINITIALIZED */ > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 10, NULL); > + ole_expect(hres, S_OK); > + IPicture_Release(pic); > + > + desc.cbSizeofstruct = sizeof(PICTDESC); > + desc.picType = PICTYPE_ICON; > + desc.u.icon.hicon = LoadIcon(NULL, IDI_APPLICATION); > + if(!desc.u.icon.hicon){ > + win_skip("LoadIcon failed. Skipping...\n"); Shouldn't you also use ReleaseDC() here for consistency sake? > + return; > + } > + > + OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (VOID**)&pic); > + /* zero dimensions, PICTYPE_ICON */ > + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); > + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); > + IPicture_Release(pic); > + > + ReleaseDC(NULL, hdc); -- Cheers, Paul.

2 1

Re: oleaut32: added PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture::Render with test
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Nikolay Sivov <bunglehead(a)gmail.com> writes: > Changelog: > - added PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture::Render with test > - added test for zero dimensions > - remove some tabs from testfile Please don't change formatting, especially with an incorrect tab size. -- Alexandre Julliard julliard(a)winehq.org

3 3