November 2006 - Wine-Devel - list.winehq.org

Re: d3d [8]: Remove AddRef from IWineD3D*_QueryInterface. This also removes the implicit AddRef in IWineD3D*_GetContainer.
by H. Verbeet Nov. 28, 2006

Nov. 28, 2006

I thought we discussed on IRC why this is a bad idea? Anyway, you can't do this. Removing the AddRef in QueryInterface is a pretty blatant violation of COM specs, and is pretty sure to cause problems somewhere. The caller of that function won't always know if the object it's called on is a wined3d object or not, and will depend on the behaviour of QueryInterface as defined by COM. Another thing is that know we get a situation where wined3d objects behave differently from all other COM objects. Also, if, as you stated earlier, the idea of these patches is *not* to get rid of COM in wined3d, I think they're a bad idea. Because in that case all it will do is make wined3d violate COM rules.

3 3

Re: [2/8] wined3d: Select the right shader backend when creating the device
by Ivan Gyurdiev Nov. 28, 2006

Nov. 28, 2006

H. Verbeet wrote: > Changelog: > - Select the right shader backend when creating the device Imho there should be either ps_selected/vs_selected flags, or shader_backend flag, but definitely not both [ does not make sense ]. I'd opt for allowing different backends on pshader vs vshader. Maybe the current drawprim code is implemented to use ARB or GLSL for both, but that's not a good reason to disallow capability by writing future code as if the backend was unified. More importantly, you should be able to mix software shaders, with the other backends. I'm also not sure replacing all if statements with a function table is a good idea - restructuring code is dangerous, better not to do it unless new features are being added, or the code is being rewritten, or it's completely unmaintainable (I think that's a bit hard to argue).

3 9

Re: Vitaliy Margolen : wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Marcus Meissner Nov. 28, 2006

Nov. 28, 2006

On Mon, Nov 27, 2006 at 12:51:03PM -0600, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: da3676229722eb76c8a91bf8165b09cc9e58455c > URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3676229722eb76c8a91bf81… > > Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> > Date: Fri Nov 24 13:53:29 2006 -0700 > > wineshelllink: Use FreeDesktop standard to create Wine menu structure. Umm. This means we (distributor) need to supply xdg utils also for all old distros, right? Ciao, Marcus

1 0

Re: ddraw/device.c: Fixed Thunk_IDirect3DDeviceImpl_1_AddViewport
by Stefan Dösinger Nov. 28, 2006

Nov. 28, 2006

Am Montag 27 November 2006 11:23 schrieb Christoph Bumiller: > This is my first "patch" - I was trying an old game with wine > (Starfleet Academy), which crashed when using D3D, and I got the > following trace messages: > > trace:ddraw_thunk:Thunk_IDirect3DDeviceImpl_1_AddViewport > (0x1b440c)->(0x1f44f0) thunking to IDirect3DDevice3 interface. > trace:ddraw_thunk:Thunk_IDirect3DDeviceImpl_2_GetStats > (0x1b4408)->(0x1f44f0) thunking to IDirect3DDevice3 interface. > fixme:d3d7:IDirect3DDeviceImpl_3_GetStats (0x1b4408)->(0x1f44f0): Stub! > > This looks like Thunk_IDirect3DDeviceImpl_1_AddViewport called the > GetStats thunk > which called GetStats with the viewport as argument, where it set some > fields to > 0, which resulted in a segfault in IDirect3DViewportImpl_SetBackground > because IDirect3DViewportImpl->ddraw was NULL. Good catch, yeah, your patch is correct. I blamed native d3drm.dll of calling GetStats with a viewport, but it turns out that it was my fault in the end :-)

1 0

Re: riched20: Make ME_StreamIn create undos properly
by Matt Finnicum Nov. 28, 2006

Nov. 28, 2006

I retract my claim of fixing that bug, but the patch still fixes the test / crashes / has great merit otherwise. --Matt On 11/27/06, Matt Finnicum <mattfinn(a)gmail.com> wrote: > This fixes an occasional crash/assertion in richedit that has been > around for a while. It also fixes a conformance test. I also believe > it fixed bug 6005 but I'll wait for the submitter to check it since I > found testing it confusing. > > Changelog: > Make ME_StreamIn create undos properly > --- > dlls/riched20/editor.c | 20 ++++++++++---------- > dlls/riched20/tests/editor.c | 2 -- > 2 files changed, 10 insertions(+), 12 deletions(-) > > >

1 0

Re: [Module] winex11.drv A new function.
by Dmitry Timoshkov Nov. 28, 2006

Nov. 28, 2006

"Anatoly" <vostok(a)etersoft.ru> wrote: > +static struct codepair { > +unsigned short keysym; > + unsigned short ucs; > +} keysymtab[] = { Nothing prevents to make the keysymtab[] a const data. -- Dmitry.

1 0

Re: [winex11.drv/keyboard.c] Fix
by Dmitry Timoshkov Nov. 28, 2006

Nov. 28, 2006

"Anatoly" <vostok(a)etersoft.ru> wrote: > --- x11drv.h 8 Nov 2006 20:14:19 -0000 1.10 > +++ x11drv.h 24 Nov 2006 09:38:39 -0000 > @@ -19,6 +19,8 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include <config.h> You can't do that, a comment 2 lines further in that file explains what you need to do instead. -- Dmitry.

1 0

Re: mscoree [1/2]: Add missing stubs to the spec file
by Paul Chitescu Nov. 28, 2006

Nov. 28, 2006

On Wed, 11 Oct 2006, James Hawkins wrote: > Hi, > > Changelog: > * Add missing stubs to the spec file. > > dlls/mscoree/mscoree.spec | 125 +++++++++++++++++++++++++++++++++++++++++++-- > 1 files changed, 120 insertions(+), 5 deletions(-) Interesting - what mscoree version are those ordinals from? I got mines from XP Home SP2. Paul Chitescu

3 8

Re: msxml3: Implement createProcessingInstruction with a stub PI object.
by Lei Zhang Nov. 28, 2006

Nov. 28, 2006

domdoc.c:domdoc_createProcessingInstruction() uses xmlNewDocPI() from libxml2. This feature was added in libxml2 version 2.6.15. (released about 2 years ago) Anyone using an older distro with an outdated libxml2 (e.x. RHEL 3) will not be able to compile this code. On 11/16/06, Huw Davies <huw(a)codeweavers.com> wrote: > --- > dlls/msxml3/Makefile.in | 1 > dlls/msxml3/domdoc.c | 19 +- > dlls/msxml3/msxml_private.h | 1 > dlls/msxml3/pi.c | 544 +++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 563 insertions(+), 2 deletions(-) > > > > > >

1 1

Re: [3/8] wined3d: Create a separate function for sampling a texture
by Ivan Gyurdiev Nov. 27, 2006

Nov. 27, 2006

H. Verbeet wrote: > There are a couple of instructions that have to sample from a texture, > right now most of them duplicate that code, and hardcode the texture > type. > > Changelog: > - Create a separate function for sampling a texture You should continue to use "add_param" or "get_register_name". There should be a single point in the code where register names are constructed, adding another one is a bad idea. This function is specifically tasked with naming registers, and taking into account things like relative addressing, so that when samplers support relative addressing in the future, changing the naming scheme would be trivial.

2 3

Re: [4/8] wined3d: Fix the texm3x3tex instruction to sample properly
by Mirek Nov. 27, 2006

Nov. 27, 2006

Wow, I am impressed those patches fixed almost all tests in 3DMark 2003, test4 (mother nature), vertex shader and Ragtroll without any regression in other apps. Perfect work! Mirek H. Verbeet napsal(a): > The current code for texm3x3tex doesn't handle projected textures, and > actually uses the wrong argument to determine the sampler type. This > patch fixes the turtle in the 4th game test in 3DMark03. > > Changelog: > - Fix the texm3x3tex instruction to sample properly > > > ------------------------------------------------------------------------ > > --- > > dlls/wined3d/arb_program_shader.c | 6 ++++-- > dlls/wined3d/glsl_shader.c | 23 ++++++----------------- > 2 files changed, 10 insertions(+), 19 deletions(-) > > diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c > index 9f2be9b..7c73fd4 100644 > --- a/dlls/wined3d/arb_program_shader.c > +++ b/dlls/wined3d/arb_program_shader.c > @@ -781,13 +781,15 @@ void pshader_hw_texm3x3tex(SHADER_OPCODE > DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; > SHADER_BUFFER* buffer = arg->buffer; > SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; > + char dst_str[8]; > char src0_name[50]; > > pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); > shader_addline(buffer, "DP3 TMP.z, T%u, %s;\n", reg, src0_name); > > - /* Cubemap textures will be more used than 3D ones. */ > - shader_addline(buffer, "TEX T%u, TMP, texture[%u], CUBE;\n", reg, reg); > + /* Sample the texture using the calculated coordinates */ > + sprintf(dst_str, "T%u", reg); > + shader_hw_sample(arg, reg, dst_str, "TMP"); > current_state->current_row = 0; > } > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 6be71bb..39ad693 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -1560,33 +1560,22 @@ void pshader_glsl_texm3x2tex(SHADER_OPCO > } > > /** Process the WINED3DSIO_TEXM3X3TEX instruction in GLSL > - * Perform the 3rd row of a 3x3 matrix multiply, then sample the texture using the calculate coordinates */ > + * Perform the 3rd row of a 3x3 matrix multiply, then sample the texture using the calculated coordinates */ > void pshader_glsl_texm3x3tex(SHADER_OPCODE_ARG* arg) { > - > + char dst_str[8]; > char src0_str[100]; > char src0_name[50]; > char src0_mask[6]; > - char dimensions[5]; > DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; > - DWORD src0_regnum = arg->src[0] & WINED3DSP_REGNUM_MASK; > - DWORD stype = arg->reg_maps->samplers[src0_regnum] & WINED3DSP_TEXTURETYPE_MASK; > IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; > SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; > - > - switch (stype) { > - case WINED3DSTT_2D: strcpy(dimensions, "2D"); break; > - case WINED3DSTT_CUBE: strcpy(dimensions, "Cube"); break; > - case WINED3DSTT_VOLUME: strcpy(dimensions, "3D"); break; > - default: > - strcpy(dimensions, ""); > - FIXME("Unrecognized sampler type: %#x\n", stype); > - break; > - } > > shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_name, src0_mask, src0_str); > shader_addline(arg->buffer, "tmp0.z = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); > - shader_addline(arg->buffer, "T%u = texture%s(Psampler%u, tmp0.%s);\n", > - reg, dimensions, reg, (stype == WINED3DSTT_2D) ? "xy" : "xyz"); > + > + /* Sample the texture using the calculated coordinates */ > + sprintf(dst_str, "T%u", reg); > + shader_glsl_sample(arg, reg, dst_str, "tmp0"); > current_state->current_row = 0; > } > > > > ------------------------------------------------------------------------ > >

1 0

WineD3D state management
by Stefan Dösinger Nov. 27, 2006

Nov. 27, 2006

Hi, In the past days I've been hacking on implementing my state management ideas, and I think I've come to a state where I don't have to be completely ashamed of my patches :-) First, what the code does NOT do yet: * Pixel Shaders, GLSL shaders: I only had my notebook with the M9 available, so I had no chance to implement them. Expect anything from broken graphics to the sudden release of Duke Nukem Forever if you try to use them. * Stateblocks * Register combiners: Disabled right now * Offscreen rendering: Causes random rendering garbage * 2D Blits: Commented out I have described the basic ideas in earlier mails(http://www.winehq.org/pipermail/wine-devel/2006-October/051868.html), so I don't describe them here again. I pretty much followed the original plan. Performance: One of the aims was to get better performance, since we apparently lost performance due to exessive state changes which eat CPU time and may require CPU-GPU syncs. My patches improve performance, but not as much as I originally hoped. I mainly have performance figures on the M9, and some basic testing on a gf7600. * Billboard dx8 sdk demo: got from 56fps to 107 fps :-) * Half-Life 1: Quite an improvement here too. 110->150 fps in one of my timedemos. The d3d renderer now outperforms the opengl renderer(140 fps). Both the billboard demo and hl1 hit a special rendering case(no stream source or fvf changes), this is nicely optimized by my changes. The gl renderer in hl1 uses immediate mode drawing while wined3d can use VBOs and array drawing, thus beeing faster on today's cards. * Battlefield 1942: Slight improvement too, 32->37 fps on my testing scene(spawn point on a u.s. carrier(a)full graphics). BF1942 exceeded the usual linux/windows driver performance ratio already before, so I assume I'm pretty much at the limit of my M9 here. * 3DMark2000: Unfortunately my driver crashes it before showing the scores, so I can only watch the in-test counter. Seems to get +5 to +10 fps in the low detail helicopter test(resolution independent). Native msvcrt.dll gets another +5 fps. I did only a short testing on my geforce7600: * 3dmark2000: gets 11500 3dmarks, with forcing drawStridedFast 14500. This is I believe the windows performance. However, the benchmark is too old to be meaningful. Before my state patches drawStridedFast scroe was around 13500 if I remember correctly, have to retest. * 3dmark2001: Low detail tests run at 150-300 fps, too fast for a meaningful result. high detail tests are slow and partially broken due to offscreen rendering. * Battlefield 1942: Runs at steady 100fps, but it did that already before So it seems that the state patches improve one bottleneck, but we have still many others(offscreen rendering, drawStridedSlow) left. The nvidia profiling driver may help here. Where to go from here: The state management was also planned to make implementing other features easier: * Multithreading: Make the dirty states list per context, and the helpers stored in the device too. Before applying the states activate the correct ctx for the thread. * Stateblocks: Basic idea is to record a display list and call it: glNewList(stateblock->listname, GL_COMPILE); for(i = 1; i <= STATE_HIGHEST; i++) { States[i].func(i, stateblock); } glEndList(); To apply the stateblock: glCallList(stateblock->listname); Ok, we need to split the list to apply only partial states, and the for loop can be improved to create a more efficient list. When the stateblock is altered we have to recreate the list. Thats the basic idea... * Offscreen rendering: Depends on wether we need seperate contexts for pbuffers. If yes, include it with the multithreading ctx finding, then apply the states, otherwise I think we can make selecting the pbuffer/fbo a state like all others. Has interactions with the viewport(I think) and the projection matrix(render_offscreen for upside down rendering) * sRGB textures: Dirtifies the sampler. All textures have now information about how many samplers they are bound to, and the number of one of the samplers. Phil? * Vertex samplers: Ivan said he'd need the state management for them. My idea is to build a d3d sampler - gl sampler mapping in SetTexture, which will be needed for register combiners too. Based on that we can bind vtf samplers in gl. I have no clean patches right now(45 chaotic patches), so I decided to share my wined3d directory. However, this is even compressed a bit big for a mailing list, so I uploaded it to http://stud4.tuwien.ac.at/~e0526822/wined3d-statemgmt.tar.bz2 Stefan

4 9

[wiki] multi language FrontPage
by Karsten Elfenbein Nov. 27, 2006

Nov. 27, 2006

Hi, could a wiki admin please delete StartSeite on the wiki. According to http://wiki.winehq.org/HelpOnLanguages the wiki would use the english FrontPage if StartSeite doesn't exist. The german FrontPage isn't needed as the users don't get any information about wine there. Karsten

1 0

re: wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Dan Kegel Nov. 27, 2006

Nov. 27, 2006

Vitaly wrote: > [xdg-utils] can not handle files with spaces in them. If that's true, it's a bug, and should be fixed. > Also they don't allow installing icons without specifying size. ? http://portland.freedesktop.org/xdg-utils-1.0/xdg-desktop-icon.html doesn't seem to talk about sizes at all. > [We can't just check the scripts into the wine source tree > and require their installation.] Why not? If they save effort and work well, let's do it. - Dan

7 6

Re: WineD3D state management
by Stefan Dösinger Nov. 27, 2006

Nov. 27, 2006

Am Montag 27 November 2006 13:36 schrieben Sie: > Here is log from 3DMark 2005, some new games are not working with those > patches, 3DMark 2001 works but very bad in high details tests. 05 fails because of pixel shaders / glsl, and I know that 2001 is broken because my patch doesn't care for offscreen rendering yet. The mail was mainly to show what the code looks like, rather than doing extensive testing. Its time for testing once pshaders, glsl and offscreen rendering are in. Sorry - Should have mentioned that in my original mail

3 4

Re: sfd2ttf - modify buglist entry
by theun.wine.mail＠planet.nl Nov. 27, 2006

Nov. 27, 2006

----- Oorspronkelijk bericht ----- Van: Markus Amsler <markus.amsler(a)oribi.org> Datum: zaterdag, november 25, 2006 11:05 pm Onderwerp: Re: sfd2ttf > theun.wine.mail(a)planet.nl wrote: > > Hi, > > > >>From the buglist I gather that the fontforge dependency is still > an issue. > > > > I've taken a look at the sources and I think a can strip it down to > > about 5 to 10 pages of code without a major rewrite. > > > > If this is acceptable, I'd be happy to spend my time. > > > > Are you sure? > > The problem is TTF generation. There's no library and it's not > trivial. > With 5 to 10 pages its impossible to generate a valid, non-empty > TTF file. > > I tried it once with dropping all unnecesary features (Apple > Advanced > Typography, Codpages, ...) and managed to get it down to 500 KB. > Without > Code obfuscation or comment dropping my guessed minimum was around > 350 > KB which would be around 150-200 pages of code. And we agreed > that's too > much, so I stopped my efforts. > You can download my latest version from [1]. There was also a > sfd2ttf > thread some time ago. > > So sfd2ttf is not feasible, and AJ wonn't commit TTF files so I > think we > could resolve this bug as WONTFIX. > > Markus > > [1] http://oribi.org/download/sfd2ttf.tar.gz > > Obviously, you've already put quite a bit of effort in sfd2ttf and the result is there. Since it also clear that the sfd2ttf entry in the buglist in far from up to date, I think it's a good idea to modify the entry to reflect the current status. Hopefully, this will prevent other potential contributers from wasting their time. Thanks, Theun van der Veen.

1 0

Yet another Wine success story: the CD-ROM in today's LA Times runs ok
by Dan Kegel Nov. 27, 2006

Nov. 27, 2006

The Sunday Los Angeles Times had a CD-ROM insert today (a promo from Vonage about upcoming Hollywood films, go figure). With some trepidation, I tried it out with Wine... and it worked flawlessly (OK, maybe there was one audio stutter). It was a Flash 8 executable, and played very smoothly on my beefy Athlon laptop. Congratulations again to Team Wine... - Dan

1 0

Re: [AppDB] (resend) Add basic rating logic checking
by Chris Morgan Nov. 26, 2006

Nov. 26, 2006

On Sunday 26 November 2006 12:49 pm, Alexander Nicolaysen Sørnes wrote: > Add basic rating logic checking, by asking the user to correct the error if > > - Installs? = No and the rating is Platinum > - Runs? is not 'yes' and rating is not Garbage > > > Regards, > > Alexander N. Sørnes When the erorr occurs is the users data retained so they can correct the error and continue without re-entering it? Chris

1 0

Re: [6/6] Add a partial COFF library support to the winedump
by Eric Pouech Nov. 26, 2006

Nov. 26, 2006

Dmitry Timoshkov a écrit : > Hello, > > this implementation is able to parse imports libraries from the PSDK > and hopefully should help interested parties to check/synchronize ordinal > imports between Wine and Windows. > > The dumper is not able (yet) to parse import libraries with the long format > described in Portable Executable and Common Object File Format Specification > and uuid.lib. > > I think it's a bad idea to "force" the kind of file on the command line for dumping I'd rather see winedump guess the file format based on the file header, as we do for .exe, .dll, .mdmp, .pdb, .dbg... we didn't do it for emf and lnk because it seems they don't have a simple header to find it out, but .lib files definitively have you should also provide support for the -C option (symbol demangling) BTW, I have a couple of patches for debug files dumping (.pdb, .dbg...), that should help the dumping of debug information from a coff file (when needed) A+

2 3

sfd2ttf
by theun.wine.mail＠planet.nl Nov. 25, 2006

Nov. 25, 2006

Hi, >From the buglist I gather that the fontforge dependency is still an issue. I've taken a look at the sources and I think a can strip it down to about 5 to 10 pages of code without a major rewrite. If this is acceptable, I'd be happy to spend my time. Theun van der Veen

2 1

Re: wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Vitaliy Margolen Nov. 25, 2006

Nov. 25, 2006

Jeremy White wrote: > I would strongly recommend that this be done instead with > xdg-utils: > > http://portland.freedesktop.org/wiki/XdgUtils Sure, but they can not handle files with spaces in them. Also they don't work as-is with Wine's winemenubuilder. Which will require at least one more wrapper script. Also they don't allow installing icons without specifying size. And all in all it will be 4 large scripts instead of 1 small. > That will allow us to avoid the pain of maintaining our own > implementation, and allow distro vendors to make their distro > work with Wine just by supplying a working version of xdg-utils. It's been discussed multiple times here. And last time I remember agreement was not to introduce any additional dependencies. I have also checked, and not a single distro had those installed. I do not want to depend on something that's no one has, and no way to distribute it to users either. > The trick is whether or not we can persuade Alexandre and/or all > of the Wine packagers to include xdg-utils by default in distributions. That's not his call but packagers. And the problem will remain the same. Vitaliy.

2 1

Extending the testframe to cope with different windows versions
by Paul Vriens Nov. 25, 2006

Nov. 25, 2006

Hi, after my last patch to yet 'remove' another test I had another look at tests.winehq.org. With the arrival of IE7 and of course a lot of changes to dll's (not even mentioning Vista) it looks like Windows versions are starting to behave not even close to similar. How can we deal with these differences? Several tests we have already include checks against a lot of possible return values or errorcodes. It's a shame when we have to stop running a test because it fails on 1 or more versions of Windows. If the end-result is that we start excluding more-and-more tests, then we should start doubting the usefulness of the regression tests. Any ideas ? Cheers, Paul.

4 5

Re: winex11.drv: Cast-qual warning fix + remove superfluous HeapFree()
by Paul Vriens Nov. 25, 2006

Nov. 25, 2006

On Sat, 2006-11-25 at 12:41 +0000, Andrew Talbot wrote: > Changelog: > winex11.drv: Cast-qual warning fix + remove superfluous HeapFree(). > > diff -urN a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c > --- a/dlls/winex11.drv/clipboard.c 2006-10-09 20:06:04.000000000 +0100 > +++ b/dlls/winex11.drv/clipboard.c 2006-11-25 12:37:27.000000000 +0000 > @@ -511,7 +511,8 @@ > { > LPWINE_CLIPFORMAT lpFormat; > LPWINE_CLIPFORMAT lpNewFormat; > - > + LPWSTR new_name; > + > /* allocate storage for new format entry */ > lpNewFormat = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_CLIPFORMAT)); > > @@ -521,14 +522,13 @@ > return NULL; > } > > - if (!(lpNewFormat->Name = HeapAlloc(GetProcessHeap(), 0, (strlenW(FormatName)+1)*sizeof(WCHAR)))) > + if (!(new_name = HeapAlloc(GetProcessHeap(), 0, (strlenW(FormatName)+1)*sizeof(WCHAR)))) > { > WARN("No more memory for the new format name!\n"); > - HeapFree(GetProcessHeap(), 0, lpNewFormat); > return NULL; > } > > - strcpyW((LPWSTR)lpNewFormat->Name, FormatName); > + lpNewFormat->Name = strcpyW(new_name, FormatName); > lpNewFormat->wFlags = 0; > lpNewFormat->wFormatID = GlobalAddAtomW(lpNewFormat->Name); > lpNewFormat->drvData = prop; > > Just out of curiosity. Why is the HeapFree superfluous? It is allocated a few lines above and not free-ed in this fail condition. Cheers, Paul.

2 3

Re: wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Jeremy White Nov. 24, 2006

Nov. 24, 2006

I would strongly recommend that this be done instead with xdg-utils: http://portland.freedesktop.org/wiki/XdgUtils That will allow us to avoid the pain of maintaining our own implementation, and allow distro vendors to make their distro work with Wine just by supplying a working version of xdg-utils. The trick is whether or not we can persuade Alexandre and/or all of the Wine packagers to include xdg-utils by default in distributions. Cheers, Jeremy Vitaliy Margolen wrote: > Change Log: > wineshelllink: Use FreeDesktop standard to create Wine menu structure. > > The major changes include: > - Use WM independent paths for all generated files. > - Dynamically build .menu and .directory files to create menu structure. > - Store icons in local icon store using their "cryptic" names to avoid conflicts. > - Number of other changes required for compatibility. > Note: .desktop links are still stored in a directory structure representing > Start Menu. This is done for possible future expansion. > > This new approach should work with KDE, Gnome and other XDG compliant managers. > I have verified this with recent versions of KDE and Gnome on several distros. > > However there are might be some problems with some custom changes some distros > might have. As an example SuSE has special feature that doesn't work right: > https://bugzilla.novell.com/show_bug.cgi?id=188110 > > The question of removing these links after programs have been uninstalled still open. > There are number of possible ways to solve it. The simplest would be symlinking > directories containing .desktop files. However that might brake whole menu structure. > --- > tools/wineshelllink | 258 ++++++++++++++++++++++---------------------------- > 1 files changed, 114 insertions(+), 144 deletions(-) > > > ------------------------------------------------------------------------ > > diff --git a/tools/wineshelllink b/tools/wineshelllink > index db65efa..5d91afc 100755 > --- a/tools/wineshelllink > +++ b/tools/wineshelllink > @@ -4,6 +4,7 @@ > # This is used by the IShellLink interface > # > # Copyright 2000 Alexandre Julliard > +# Copyright 2006 Vitaliy Margolen > # > # This library is free software; you can redistribute it and/or > # modify it under the terms of the GNU Lesser General Public > @@ -22,8 +23,7 @@ > > # Note that the link is a relative unix-style path name. Since the / character > # is not valid in Windows filenames it is an adequate separator to show the > -# menu structure. (This program may need to split the menu structure out for > -# implementing xdg-style menus) > +# menu structure. > > mode="" > args="" > @@ -82,176 +82,146 @@ if [ -z "$link" ] ; then > usage > fi > > -kde_entry() > +desktop_entry() > { > - xname=`basename "$link"` > - cat <<EOF > -# KDE Config File > -[KDE Desktop Entry] > -Name=$xname > -Exec=wine '$path' $args > -Type=Application > -Comment=$descr > -EOF > - [ -z "$workdir" ] || echo "Path=\"$workdir\"" > - [ -z "$xpmicon" ] || echo "Icon=$xpmicon" > -} > - > -gnome_entry() > -{ > - xname=`basename "$link"` > cat <<EOF > [Desktop Entry] > -Name=$xname > +Name=$linkname > Exec=wine "$path" $args > Type=Application > -Comment=$descr > EOF > + [ -z "$descr" ] || echo "Comment=$descr" > [ -z "$workdir" ] || echo "Path=$workdir" > [ -z "$xpmicon" ] || echo "Icon=$xpmicon" > } > > -mdk_entry() > +directory_entry() > { > - base=`basename "$link"` > - section=`dirname "$link"` > - [ -z "$icon" ] || xicon="icon=\"$xpmicon\"" > - pathmenu=`echo "$path" | sed 's+\\\\+\\\\\\\\+g'` > - echo "?package(local.Wine):needs=x11 section=\"/Wine/$section\" title=\"$base\" longtitle=\"$descr\" command=\"wine '$pathmenu' $args\" $xicon" > + cat <<EOF > +[Desktop Entry] > +Type=Directory > +EOF > + if [ "$1" == "wine" ] ; then > + echo "Name=Wine" > + echo "Icon=wine" > + else > + echo "Name=$1" > + echo "Icon=folder" > + fi > } > > # copy the icon file to a specified dir and set xpmicon to the resulting path > copy_icon() > { > - dir="$1" > - mkdir -p "$dir" > - mkdir -p "$dir/""`dirname "$link"`" || true > - if [ -f "$icon" ] > - then > - cp "$icon" "$dir/$link.xpm" > - xpmicon="$dir/$link.xpm" > - else > - xpmicon="" > - fi > + if [ -f "$icon" ] > + then > + xpmicon=`basename "$icon" .xpm` > + > + mkdir -p "$1" > + cp "$icon" "$1/$xpmicon.xpm" > + else > + xpmicon="" > + fi > } > > -# Debian/Mandrake > - > -type update-menus > /dev/null 2>&1 > -if [ $? = 0 -a $mode = "menu" ] > -then > - iconname="`basename "$link"`.xpm" > - dir="$HOME/.menu/icons" > - if [ -f "$icon" ] > - then > - mkdir -p "$dir" > - cp "$icon" "$dir/$iconname" > - xpmicon="$dir/$iconname" > - else > - xpmicon="" > - fi > - mdk_entry >> "$HOME/.menu/wine" > - if [ -d "/usr/lib/menu" ] && [ -w "/usr/lib/menu" ] > - then > - mdk_entry >> "/usr/lib/menu/wine" > - fi > - update-menus > /dev/null 2>&1 > -fi > +# XDG > > -# KDE > +xdg_config_dir="$XDG_CONFIG_HOME" > +[ -n "$xdg_user_dir" ] || xdg_config_dir="$HOME/.config" > +xdg_config_dir="$xdg_config_dir/menus/applications-merged" > > -if [ -d "$HOME/.kde" ] > -then > - kdeversion=0 > - if type kde-config >/dev/null 2>&1 > - then > - kdeversion=`kde-config -v | grep KDE: | sed -n "s/^KDE: $[^.]*$\..*$/\1/p"` > - fi > +xdg_data_dir="$XDG_DATA_HOME" > +[ -n "$xdg_data_dir" ] || xdg_data_dir="$HOME/.local/share" > > - if [ $kdeversion -ge 2 ] > - then > - copy_icon "$HOME/.kde/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde/share/applnk/Wine/$link.desktop" > - elif [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > +# Create common directories > +mkdir -p "$xdg_config_dir" > +mkdir -p "$xdg_data_dir/desktop-directories" > + > +get_menu_entries() > +{ > + tmp="$xdg_config_dir/$1.menu" > + > + if [ -r "$tmp" ] ; then > + awk ' > +BEGIN { RS="<" } > +/^Filename/ { > + if (match($0,/>/)) { > + print substr($0,RSTART+1) > + } > +}' $tmp > fi > - else > - copy_icon "$HOME/.kde/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - kde_entry > "$HOME/.kde/share/applnk/Wine/$link.kdelnk" > +} > > - # KDE 1.x kludge. Wake up KDE, if we can find kpanel running > - type kwmcom >/dev/null 2>/dev/null && \ > - ps u -C kpanel >/dev/null 2>/dev/null && \ > - kwmcom kpanel:restart > +# Input > +# menu file name > +# new item > +write_menu_file() > +{ > + tmpfile=`mktemp` > + ( > + echo '<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"' > + echo '"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">' > + echo '<Menu>' > + echo ' <Name>Applications</Name>' > + > + IFS="-" > + > + fullname='wine' > + for i in $1; do > + echo " <Menu>" > + echo " <Name>$fullname-$i</Name>" > + echo " <Directory>$fullname-$i.directory</Directory>" > + > + dir_file_name="$xdg_data_dir/desktop-directories/$fullname-$i.directory" > + if [ ! -f "$dir_file_name" ] ; then > + directory_entry "$i" > "$dir_file_name" > + fi > + test "$i" = "wine" || fullname="$fullname-$i" > + done > + > + echo " <Include>" > + > + IFS=" > +" > + for i in $(get_menu_entries "$1"); do > + test "$i" = "$2" && continue > + echo " <Filename>$i</Filename>" > + done > + > + # New record > + echo " <Filename>$2</Filename>" > + echo " </Include>" > + > + IFS='-' > + for i in $1; do > + echo " </Menu>" > + done > + echo '</Menu>' > + ) > $tmpfile > + chmod 0600 $tmpfile > + > + mv -f $tmpfile "$xdg_config_dir/$1.menu" > +} > > - elif [ -d "$HOME/Desktop" ] > - then > - kde_entry > "$HOME/Desktop/$link.kdelnk" > - # KDE 1.x kludge: wake up KDE, if we can find kfm running... > - type kfmclient >/dev/null 2>/dev/null && \ > - ps u -C kfm >/dev/null 2>/dev/null && \ > - kfmclient refreshDesktop > - fi > - fi > -fi > > -if [ -d "$HOME/.kde2" ] > -then > - copy_icon "$HOME/.kde2/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde2/share/applnk/Wine/$link.desktop" > - else > - if [ -d "$HOME/Desktop2" ] > - then > - gnome_entry > "$HOME/Desktop2/$link.desktop" > - fi > - if [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > - fi > - fi > -fi > +copy_icon "$xdg_data_dir/icons" > > -if [ -d "$HOME/.kde3/share/applnk" ] > -then > - copy_icon "$HOME/.kde3/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde3/share/applnk/Wine/$link.desktop" > - else > - if [ -d "$HOME/Desktop3" ] > - then > - gnome_entry > "$HOME/Desktop3/$link.desktop" > - fi > - if [ -d "$HOME/Desktop2" ] > - then > - gnome_entry > "$HOME/Desktop2/$link.desktop" > - fi > - if [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > +linkname=`basename "$link"` > + > +if [ $mode = "menu" ] ; then > + mkdir -p "$xdg_data_dir/applications/wine/`dirname "$link"`" > + > + linkpath=`dirname "$link" | sed 's!/!-!g'` > + if [ "$linkpath" == "." ] ; then > + linkpath="" > + else > + linkpath="-$linkpath" > fi > - fi > -fi > > -# Gnome > - > -if [ -d "$HOME/.gnome" ] > -then > - copy_icon "$HOME/.gnome/apps/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.gnome/apps/Wine/$link.desktop" > - elif [ -d "$HOME/.gnome-desktop" ] > - then > - gnome_entry > "$HOME/.gnome-desktop/$link.desktop" > - fi > + desktop_entry > "$xdg_data_dir/applications/wine/$link.desktop" > + write_menu_file "wine$linkpath" "wine$linkpath-$linkname.desktop" > +else > + desktop_entry > "$HOME/Desktop/$linkname.desktop" > fi > > exit 0 > > > > ------------------------------------------------------------------------ > >

2 1

WM_SETFONT support
by Jing Li Nov. 24, 2006

Nov. 24, 2006

Hi, I am building a dialog box which is used to display the license agreement information. I create my dialog template with the dialog editor. The dialog box contains the "Microsoft Rich Textbox Control" (ActiveX control). When the function DialogBox() is called to display the dialog box, the command "WM_SETFONT" is sent to my dialog procedure and the dialog box does not pop up at all. Do you know how to deal with this problem? The only information I've got from MSDN is "The dialog box procedure is responsible for saving the font handle passed with the WM_SETFONT message and selecting the handle into the display device context whenever it writes text to the window." Thanks a lot for your response and help. Regards, Jing

2 1