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

Re: gdiplus: Add support for horizontal string alignment to GdipDrawString
by Vincent Povirk June 8, 2009

June 8, 2009

This looks wrong to me. You're only adjusting the left coordinate, but in case of a rotation in the world transform, you'll need to adjust the top as well. Also, I think you may still be able to use DT_CENTER and DT_RIGHT rather than measuring the string beforehand. Creating a rectangle something like the original is difficult, but DrawText probably only needs to know the top-center or top-right point to do these other alignments. So it should be able to align things properly if you give it a rectangle where all corners are the point where it anchors the text. DrawText doesn't need the original rectangle because gdiplus does the clipping and wrapping (and it already doesn't get the original rectangle anyway). Vincent Povirk On Sat, Jun 6, 2009 at 2:19 PM, Stephan Rose<kermos(a)somrek.net> wrote: > Adds support for horizontal string alignment to GdipDrawString without > using DT_CENTER or DT_RIGHT. > > > >

2 2

New winetricks 20090607: new verbs d3dx9, fontsmooth-foo, vb2run, vcrun2008sp1, wme9, xact
by Dan Kegel June 8, 2009

June 8, 2009

Another, er, quarter, another winetricks. Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com Thanks to Austin English for taking on most of the work keeping winetricks up to date! (And apologies for my own slowness in doing another release.) Changes since 20090116: ------------------------------------------------------------------------ r491 | daniel.r.kegel | 2009-06-07 17:36:52 -0700 (Sun, 07 Jun 2009) | 2 lines Bump version, mention that Dan still maintains too. ------------------------------------------------------------------------ r489 | daniel.r.kegel | 2009-06-07 17:14:08 -0700 (Sun, 07 Jun 2009) | 4 lines Avoid using gnu tar extensions in liberation verb. Simplifies opensolaris support. ------------------------------------------------------------------------ r479 | austinenglish | 2009-05-31 20:11:06 -0700 (Sun, 31 May 2009) | 2 lines winetricks: Dan doesn't like subshells. I agree, they're messy. Get rid of one for liberation. ------------------------------------------------------------------------ r478 | austinenglish | 2009-05-31 20:08:27 -0700 (Sun, 31 May 2009) | 2 lines winetricks: clarify volnum workaround for vcrun2008 ------------------------------------------------------------------------ r477 | austinenglish | 2009-05-31 19:52:50 -0700 (Sun, 31 May 2009) | 2 lines winetricks: make sure we 'try' for all cp's, fix case-sensitive ones with wildcards ------------------------------------------------------------------------ r476 | austinenglish | 2009-05-31 19:08:30 -0700 (Sun, 31 May 2009) | 2 lines winetricks: only output Opensolaris info if running on OpenSolaris ------------------------------------------------------------------------ r475 | austinenglish | 2009-05-31 18:56:46 -0700 (Sun, 31 May 2009) | 2 lines winetricks: fix version function to only print the version ------------------------------------------------------------------------ r474 | daniel.r.kegel | 2009-05-31 17:38:50 -0700 (Sun, 31 May 2009) | 2 lines Be slightly more descriptive in fontsmooth verbs. ------------------------------------------------------------------------ r473 | austinenglish | 2009-05-31 12:55:44 -0700 (Sun, 31 May 2009) | 2 lines winetricks: work around kde bug ------------------------------------------------------------------------ r472 | austinenglish | 2009-05-30 19:03:23 -0700 (Sat, 30 May 2009) | 2 lines winetricks: minor ie6 fixes ------------------------------------------------------------------------ r471 | austinenglish | 2009-05-30 12:07:52 -0700 (Sat, 30 May 2009) | 2 lines winetricks: fix vcrun2008sp1 for old wine versions (1.0.1) ------------------------------------------------------------------------ r470 | austinenglish | 2009-05-30 08:48:48 -0700 (Sat, 30 May 2009) | 2 lines winetricks: make sure to run gunzip in a separate shell ------------------------------------------------------------------------ r467 | austinenglish | 2009-05-28 17:01:27 -0700 (Thu, 28 May 2009) | 2 lines winetricks: add a note about fixing local keystores for OpenSolaris ------------------------------------------------------------------------ r466 | austinenglish | 2009-05-28 16:50:17 -0700 (Thu, 28 May 2009) | 2 lines winetricks: fix busted urls and make a new release ------------------------------------------------------------------------ r465 | austinenglish | 2009-05-28 16:49:11 -0700 (Thu, 28 May 2009) | 2 lines winetricks: fix typo in last patch (liberation opensolaris fix) ------------------------------------------------------------------------ r464 | austinenglish | 2009-05-28 16:35:22 -0700 (Thu, 28 May 2009) | 2 lines winetricks: fix liberation verb for systems without tar (Patch by Matt Lewandowsky) ------------------------------------------------------------------------ r462 | austinenglish | 2009-05-27 21:29:30 -0700 (Wed, 27 May 2009) | 2 lines winetricks: disable services for wmp9/wmp10 ------------------------------------------------------------------------ r461 | austinenglish | 2009-05-27 21:09:51 -0700 (Wed, 27 May 2009) | 2 lines winetricks: fix ie6 install ------------------------------------------------------------------------ r460 | austinenglish | 2009-05-27 00:38:10 -0700 (Wed, 27 May 2009) | 2 lines winetricks: fix ie6 verb for non-english locales ------------------------------------------------------------------------ r439 | austinenglish | 2009-04-20 20:26:21 -0700 (Mon, 20 Apr 2009) | 2 lines winetricks: add gecko-dbg verb ------------------------------------------------------------------------ r438 | austinenglish | 2009-04-19 18:49:30 -0700 (Sun, 19 Apr 2009) | 2 lines winetricks: add version function ------------------------------------------------------------------------ r430 | austinenglish | 2009-04-06 23:40:27 -0700 (Mon, 06 Apr 2009) | 2 lines winetricks: fix download for fontfix verb ------------------------------------------------------------------------ r422 | austinenglish | 2009-03-30 17:15:39 -0700 (Mon, 30 Mar 2009) | 2 lines winetricks: add a sanity check to prevent running as sudo ------------------------------------------------------------------------ r420 | austinenglish | 2009-03-29 14:02:50 -0700 (Sun, 29 Mar 2009) | 2 lines winetricks: override rest of d3dx9_xx dlls. Patch by Rico Schüller ------------------------------------------------------------------------ r419 | austinenglish | 2009-03-29 13:59:36 -0700 (Sun, 29 Mar 2009) | 2 lines winetricks: update directx to March 2009 release ------------------------------------------------------------------------ r416 | austinenglish | 2009-03-29 08:44:32 -0700 (Sun, 29 Mar 2009) | 2 lines winetricks: updated a couple comments ------------------------------------------------------------------------ r415 | austinenglish | 2009-03-27 16:03:28 -0700 (Fri, 27 Mar 2009) | 2 lines winetricks: fix gecko for FreeBSD ------------------------------------------------------------------------ r412 | austinenglish | 2009-03-26 21:38:19 -0700 (Thu, 26 Mar 2009) | 3 lines winetricks: avoid 'echo -n', it's not portable and breaks on Solaris. Patch by Dan Kegel. ------------------------------------------------------------------------ r403 | austinenglish | 2009-03-22 18:32:47 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: release 20090322 ------------------------------------------------------------------------ r401 | austinenglish | 2009-03-22 17:41:31 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: load wsh56 for controlpad ------------------------------------------------------------------------ r400 | austinenglish | 2009-03-22 17:32:12 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: couple minor changes ------------------------------------------------------------------------ r399 | austinenglish | 2009-03-22 17:21:16 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: add native overrides for ole2 ------------------------------------------------------------------------ r398 | austinenglish | 2009-03-22 17:03:11 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: load dotnet20 for vjrun20 ------------------------------------------------------------------------ r397 | austinenglish | 2009-03-22 16:54:39 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: fix kde download link, update to latest stable ------------------------------------------------------------------------ r396 | austinenglish | 2009-03-22 16:39:09 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: add fontsmoothing options ------------------------------------------------------------------------ r395 | austinenglish | 2009-03-22 16:07:21 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: fix msmask, make case insensitive ------------------------------------------------------------------------ r394 | austinenglish | 2009-03-22 16:02:27 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: update divx to divx7 ------------------------------------------------------------------------ r393 | austinenglish | 2009-03-22 12:33:55 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: add a few more synonmys for some keywords ------------------------------------------------------------------------ r392 | austinenglish | 2009-03-22 12:30:17 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: added xact keyword. Patch by Erik Inge Bolsø. ------------------------------------------------------------------------ r391 | austinenglish | 2009-03-22 12:25:21 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: refactor directx download into a helper function. Patch by Erik Inge Bolsø. ------------------------------------------------------------------------ r390 | austinenglish | 2009-03-22 12:18:24 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: added vb2run keyword. Patch by Erik Inge Bolsø. ------------------------------------------------------------------------ r389 | austinenglish | 2009-03-22 12:14:44 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: added vcrun2008sp1 keyword. Patch by Erik Inge Bolsø. ------------------------------------------------------------------------ r388 | austinenglish | 2009-03-22 11:49:44 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: added d3dx9 redistributable. Based on patch by Erik Inge Bolsø. ------------------------------------------------------------------------ r387 | austinenglish | 2009-03-22 11:13:55 -0700 (Sun, 22 Mar 2009) | 2 lines winetricks: add msvcrt override for vcrun6 ------------------------------------------------------------------------ r386 | austinenglish | 2009-03-12 16:23:58 -0700 (Thu, 12 Mar 2009) | 2 lines winetricks: fix vlc download link ------------------------------------------------------------------------ r380 | daniel.r.kegel | 2009-02-27 09:04:02 -0800 (Fri, 27 Feb 2009) | 2 lines Update flash ------------------------------------------------------------------------ r376 | austinenglish | 2009-02-25 13:54:52 -0800 (Wed, 25 Feb 2009) | 2 lines Use builtin ole/rpc for a couple more builtin apps ------------------------------------------------------------------------ r343 | daniel.r.kegel | 2009-02-16 18:30:21 -0800 (Mon, 16 Feb 2009) | 2 lines Document license requirements better ------------------------------------------------------------------------ r337 | daniel.r.kegel | 2009-02-14 16:18:03 -0800 (Sat, 14 Feb 2009) | 2 lines Clarify mfc42, since people were installing both it and vcrun6 ------------------------------------------------------------------------ r335 | daniel.r.kegel | 2009-02-14 15:07:08 -0800 (Sat, 14 Feb 2009) | 3 lines Added wme9 Updated gecko for 1.1.15 ------------------------------------------------------------------------ r298 | daniel.r.kegel | 2009-02-09 08:04:49 -0800 (Mon, 09 Feb 2009) | 3 lines Fix a solaris problem, warn users that quicktime needs gdiplus, make version name obvious to someone looking at the top of the file ------------------------------------------------------------------------ r266 | daniel.r.kegel | 2009-01-21 06:55:58 -0800 (Wed, 21 Jan 2009) | 2 lines Fix tahoma to include tahomabd, needed for Steam.

1 0

Re: wined3d:
by James McKenzie June 7, 2009

June 7, 2009

Pavel Prochazka wrote: There is an open bug for this problem, 14746. Can you clean up and attach your fix to this bug so that others can try it? I did apply it cleanly, through three steps to version 1.1.22 of Wine. James McKenzie

1 0

Re: [Bugzilla]: Refuse to accept comments with big number of logs / back traces
by Austin English June 7, 2009

June 7, 2009

On Sun, Jun 7, 2009 at 12:25 PM, Vitaliy Margolen<wine-patches(a)kievinfo.com> wrote: > > The limits are: > 20 lines for logs (fixme, trace, err, warn) > 10 lines for back traces > --- > Bugzilla/Bug.pm | 7 +++++++ > template/en/default/global/user-error.html.tmpl | 4 ++++ > 2 files changed, 11 insertions(+), 0 deletions(-) While I'm hugely in favor of this, AFAICT, this blocks everyone from doing so, correct? What about developers that know what they're doing, or Anastasius? -- -Austin

2 1

Re: d3d9: ATI1N support
by Henri Verbeet June 7, 2009

June 7, 2009

2009/6/7 Frank Richter <frank.richter(a)gmail.com>: > +/* Download data for a compressed surface */ > +static void surface_download_data_compressed(IWineD3DSurfaceImpl *This, const struct GlPixelFormatDesc *format_desc) { > + TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p\n", > + This, This->glDescription.level, format_desc->glFormat, format_desc->glType, > + This->resource.allocatedMemory); > + > + if(This->Flags & SFLAG_PBO) { > + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); > + checkGLcall("glBindBufferARB"); > + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); > + checkGLcall("glGetCompressedTexImageARB()"); > + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); > + checkGLcall("glBindBufferARB"); > + } else { > + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, This->resource.allocatedMemory)); > + checkGLcall("glGetCompressedTexImageARB()"); > + } > +} Please don't add tabs. I also think wined3d would be more appropriate as module name for these patches.

1 0

Test box tagged [dr-asus]
by Nikolay Sivov June 7, 2009

June 7, 2009

Hi. Does anyone no whose box is it (dr-asus)? It has some (actually always 10) test failures for ListView and I think it's possible to find a cause. Same failures on 2k and XP actually. I'd like to contact owner for testing some patches. Thanks.

5 4

cd-roms that need unhide
by Dan Kegel June 7, 2009

June 7, 2009

Despite jwhite's kernel fix, http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h… I find I have to use 'norock' on some discs, e.g. Macromedia Studio 8, http://bugs.winehq.org/show_bug.cgi?id=9467 Microsoft Dynamics GP demo, http://bugs.winehq.org/show_bug.cgi?id=8178 ... and the stupid DKNY perfume promo DVD-ROM that came in the newspaper today. Running it with Wine yields... a black screen, as the flash player can't get at its data. Mounting the DKNY disc with -o unhide or -o norock lets it work fine with wine. Here's what one sees without either flag: $ ls /media/cdrom/ -l total 3668 dr-xr-xr-x 2 4294967295 4294967295 40 2007-07-24 15:54 AUDIO_TS -r-xr-xr-x 1 4294967295 4294967295 2144972 2007-07-17 20:18 DKNYDeliciousNight -r-xr-xr-x 1 4294967295 4294967295 1602372 2007-07-17 20:18 DKNYDeliciousNight.exe -r-xr-xr-x 1 4294967295 4294967295 1616 2007-02-14 06:34 Readme.txt dr--r--r-- 3 4294967295 4294967295 560 2007-07-24 15:54 VIDEO_TS (The VIDEO_TS directory is not searchable! ) Here's what one sees with unhide: dank(a)lappy:~$ ls -l /media/cdrom/ total 3788 dr-xr-xr-x 2 4294967295 4294967295 40 2007-07-24 15:54 AUDIO_TS -r-xr-xr-x 1 4294967295 4294967295 67 2007-07-05 11:20 autorun.inf dr-xr-xr-x 2 4294967295 4294967295 1032 2007-07-09 12:11 backgroundLoops dr-xr-xr-x 2 4294967295 4294967295 92 2007-06-25 14:48 css -rwxr-xr-x 1 4294967295 4294967295 1024 2007-01-03 08:47 Desktop DB -rwxr-xr-x 1 4294967295 4294967295 2 2007-01-03 08:47 Desktop DF -r-xr-xr-x 1 4294967295 4294967295 2144972 2007-07-17 20:18 DKNYDeliciousNight -r-xr-xr-x 1 4294967295 4294967295 1602372 2007-07-17 20:18 DKNYDeliciousNight.exe -r-xr-xr-x 1 4294967295 4294967295 97566 2007-06-27 14:30 DKNYDeliciousNight.ico dr-xr-xr-x 2 4294967295 4294967295 244 2007-07-13 09:30 exit dr-xr-xr-x 2 4294967295 4294967295 3400 2007-07-17 17:18 flv dr-xr-xr-x 9 4294967295 4294967295 684 2007-07-18 15:41 fscommand -r-xr-xr-x 1 4294967295 4294967295 1616 2007-02-14 06:34 Readme.txt dr-xr-xr-x 2 4294967295 4294967295 240 2007-07-09 12:11 soundFx dr-xr-xr-x 2 4294967295 4294967295 996 2007-07-18 18:50 swf dr--r--r-- 3 4294967295 4294967295 560 2007-07-24 15:54 VIDEO_TS dr-xr-xr-x 2 4294967295 4294967295 140 2007-07-05 09:23 xml (The VIDEO_TS directory is not searchable, but the app works anyway. ) norock is similar, but VIDEO_TS is searchable. Given that these poorly mastered discs are turning up periodically -- widely distributed -- it seems like it might be time for another kernel change, or at least some userland kludge that does a remount. The heuristic I imagine is: If the top level directory has any subdirectories that are completely nonsearchable or nonreadable, remount with unhide. What say? Would this help users more than it would hurt? - Dan

2 2

Re: [PATCH] This patch fixes context menu crashes for edit controls as apparent in vb apps.
by Reece Dunn June 7, 2009

June 7, 2009

2009/6/7 Michael Martin <martinmnet(a)hotmail.com>: You'll need to include the patch as an attachment (renamed as a text file if your mail client messes up the encoding), instead of including it in the body text (the indentation in the patch you included has been removed by your mail client). > + BOOL selectedMenuItem; > ... > + selectedMenuItem = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | > TMPRETURNCMD, x, y, 0, es->hwndSelf, NULL); > + switch (selectedMenuItem) { Despite TrackPopupMenu having a BOOL return type, using an int would make it more readable (selectedMenuItem is not being used as a boolean value, but as a command index). Alternatively, just use: switch (TrackPopupMenu(...)) { TMPRETURNCMD -- This should be TMP_RETURNCMD. Is this an error when adding the patch to the email? Thanks for contributing to Wine, - Reece

1 0

Re: [2/5] WineD3D: Implement loops with the NV extensions
by Allan Tong June 7, 2009

June 7, 2009

This is using PUSHA and POPA without setting the NV_vertex_program3 option in the shader. - Allan

1 0

Re: [3/5] WineD3D: Unroll loops in ARB if GL_NV_vertex_program2_option is not supported
by James Mckenzie June 6, 2009

June 6, 2009

Stefan Dösinger <stefan(a)codeweavers.com> wrote about [3/5] WineD3D: Unroll loops in ARB if GL_NV_vertex_program2_option is not supported Stefan: Could this not a be a function: + for(i = 0; i < MAX_CONST_I; i++) + { + if(int_skip & (1 << i)) + { + args->loop_ctrl[i][0] = 0; + args->loop_ctrl[i][1] = 0; + args->loop_ctrl[i][2] = 0; + } + else + { + args->loop_ctrl[i][0] = stateblock->pixelShaderConstantI[i * 4]; + args->loop_ctrl[i][1] = stateblock->pixelShaderConstantI[i * 4 + 1]; + args->loop_ctrl[i][2] = stateblock->pixelShaderConstantI[i * 4 + 2]; + } + } Also, it looks like you did not count correctly: + if(vshader) + { + /* Count and aL start value are unsigned */ + ret[0] = priv->cur_vs_args->loop_ctrl[idx][0]; + ret[1] = priv->cur_vs_args->loop_ctrl[idx][1]; + /* The step/stride is signed */ + ret[2] = ((char) priv->cur_vs_args->loop_ctrl[idx][3]); + } + else + { + ret[0] = priv->cur_ps_args->loop_ctrl[idx][0]; + ret[1] = priv->cur_ps_args->loop_ctrl[idx][1]; + ret[2] = ((char) priv->cur_ps_args->loop_ctrl[idx][3]); + } + return ret; A little explanation might help here. James McKenzie

1 0

Re: [3/5] WineD3D: Unroll loops in ARB if GL_NV_vertex_program2_option is not supported
by Henri Verbeet June 6, 2009

June 6, 2009

2009/6/7 Stefan Dösinger <stefan(a)codeweavers.com>: > +/* Not reentrant! */ > +static inline const int *get_int_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, DWORD idx) > +{ > + BOOL vshader = shader_is_vshader_version(This->baseShader.reg_maps.shader_version.type); > + WORD flag = (1 << idx); > + const local_constant *constant; > + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; > + > + if(This->baseShader.reg_maps.local_int_consts & flag) > + { > + static const int err_ret[4] = {0, 0, 0, 0}; > + /* What good is a if(bool) with a hardcoded local constant? I don't know, but handle it */ > + LIST_FOR_EACH_ENTRY(constant, &This->baseShader.constantsI, local_constant, entry) > + { > + if (constant->idx == idx) > + { > + return (int *) constant->value; > + } > + } > + ERR("Local constant not found\n"); > + return err_ret; > + } > + else > + { > + static int ret[4]; > + ret[3] = 0; > + if(vshader) > + { > + /* Count and aL start value are unsigned */ > + ret[0] = priv->cur_vs_args->loop_ctrl[idx][0]; > + ret[1] = priv->cur_vs_args->loop_ctrl[idx][1]; > + /* The step/stride is signed */ > + ret[2] = ((char) priv->cur_vs_args->loop_ctrl[idx][3]); > + } > + else > + { > + ret[0] = priv->cur_ps_args->loop_ctrl[idx][0]; > + ret[1] = priv->cur_ps_args->loop_ctrl[idx][1]; > + ret[2] = ((char) priv->cur_ps_args->loop_ctrl[idx][3]); > + } > + return ret; > + } > +} I said I wouldn't be reviewing arb_program_shader.c changes (and I'm not, in general), but I couldn't help noticing this bit of code. *blink*? > + const int *control_values = get_int_const(ins, This, ins->src[0].reg.idx); > + list_init(&priv->record); > + priv->recording = TRUE; > + control_frame->outer_loop = TRUE; > + control_frame->loop_control[0] = control_values[0]; > + control_frame->loop_control[1] = control_values[1]; > + control_frame->loop_control[1] = control_values[2]; This is either a typo or redundant.

1 0

Re: [1/5] WineD3D: Store the bumpmap ARB constants in ARB structures
by Henri Verbeet June 6, 2009

June 6, 2009

I think the actual patch is missing.

1 0

[setupapi/tests] pSetupGetField is A or W depending on OS
by Paul Vriens June 6, 2009

June 6, 2009

Hi, Sent to wine-devel for some feedback. I was checking for more lstrcmpW's (not supported on Win9x) and found one in setupapi/tests/parser.c. After some checking it turns out that it returns an ANSI string on Win9x and a Unicode one on NT4 and higher. There is no export of pSetupGetField[AW] on any of the platforms. The attached patch takes care of that but I have a feeling this patch could be written in a better way. Suggestions, hints, remarks? -- Cheers, Paul. diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index a67a5cd..3b4682e 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -32,14 +32,16 @@ /* function pointers */ static HMODULE hSetupAPI; -static LPCWSTR (WINAPI *pSetupGetField)(PINFCONTEXT,DWORD); +static LPCSTR (WINAPI *pSetupGetFieldA)(PINFCONTEXT,DWORD); +static LPCWSTR (WINAPI *pSetupGetFieldW)(PINFCONTEXT,DWORD); static BOOL (WINAPI *pSetupEnumInfSectionsA)( HINF hinf, UINT index, PSTR buffer, DWORD size, UINT *need ); static void init_function_pointers(void) { hSetupAPI = GetModuleHandleA("setupapi.dll"); - pSetupGetField = (void *)GetProcAddress(hSetupAPI, "pSetupGetField"); + pSetupGetFieldA = (void *)GetProcAddress(hSetupAPI, "pSetupGetField"); + pSetupGetFieldW = (void *)GetProcAddress(hSetupAPI, "pSetupGetField"); pSetupEnumInfSectionsA = (void *)GetProcAddress(hSetupAPI, "SetupEnumInfSectionsA" ); } @@ -497,7 +499,14 @@ static const char *contents = "[Version]\n" "[Strings]\n" "RTMQFE_NAME = \"RTMQFE\"\n"; -static const WCHAR getfield_res[][20] = +static const CHAR getfield_resA[][20] = +{ + "RTMQFE", + "%RTMGFE_NAME%", + "SP1RTM", +}; + +static const WCHAR getfield_resW[][20] = { {'R','T','M','Q','F','E',0}, {'%','R','T','M','G','F','E','_','N','A','M','E','%',0}, @@ -509,10 +518,18 @@ static void test_pSetupGetField(void) UINT err; BOOL ret; HINF hinf; - LPCWSTR field; + LPCSTR fieldA; + LPCWSTR fieldW; INFCONTEXT context; int i; int len; + BOOL unicode = TRUE; + + /* Nice, pSetupGetField is either A or W depending on the Windows version! */ + SetLastError(0xdeadbeef); + lstrcmpW(NULL, NULL); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + unicode = FALSE; hinf = test_file_contents( contents, &err ); ok( hinf != NULL, "Expected valid INF file\n" ); @@ -524,23 +541,47 @@ static void test_pSetupGetField(void) for ( i = 0; i < 3; i++ ) { - field = pSetupGetField( &context, i ); - ok( field != NULL, "Failed to get field %i\n", i ); - ok( !lstrcmpW( getfield_res[i], field ), "Wrong string returned\n" ); + if (unicode) + { + fieldW = pSetupGetFieldW( &context, i ); + ok( fieldW != NULL, "Failed to get field %i\n", i ); + ok( !lstrcmpW( getfield_resW[i], fieldW ), "Wrong string returned\n" ); + } + else + { + fieldA = pSetupGetFieldA( &context, i ); + ok( fieldA != NULL, "Failed to get field %i\n", i ); + ok( !lstrcmpA( getfield_resA[i], fieldA ), "Wrong string returned\n" ); + } } - field = pSetupGetField( &context, 3 ); - ok( field != NULL, "Failed to get field 3\n" ); - len = lstrlenW( field ); - ok( len == 511 /* NT4, W2K, XP and W2K3 */ || - len == 4096 /* Vista */ || - len == 256 /* Win9x and WinME */, - "Unexpected length, got %d\n", len ); - - field = pSetupGetField( &context, 4 ); - ok( field == NULL, "Expected NULL, got %p\n", field ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); + if (unicode) + { + fieldW = pSetupGetFieldW( &context, 3 ); + ok( fieldW != NULL, "Failed to get field 3\n" ); + len = lstrlenW( fieldW ); + ok( len == 511 || /* NT4, W2K, XP and W2K3 */ + len == 4096, /* Vista */ + "Unexpected length, got %d\n", len ); + + fieldW = pSetupGetFieldW( &context, 4 ); + ok( fieldW == NULL, "Expected NULL, got %p\n", fieldW ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); + } + else + { + fieldA = pSetupGetFieldA( &context, 3 ); + ok( fieldA != NULL, "Failed to get field 3\n" ); + len = lstrlenA( fieldA ); + ok( len == 511, /* Win9x, WinME */ + "Unexpected length, got %d\n", len ); + + fieldA = pSetupGetFieldA( &context, 4 ); + ok( fieldA == NULL, "Expected NULL, got %p\n", fieldA ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); + } SetupCloseInfFile( hinf ); }

1 0

Одговор: Одговор: Latest Git build 7aeffc442cc1 for Wine 1.1.23
by Milan Kostić June 6, 2009

June 6, 2009

2009/6/6, Henri Verbeet <hverbeet(a)gmail.com>: > 2009/6/6 Milan Kostić <smoki00790(a)gmail.com>: >> Deafulting to fbo is good, but it should be more good to leave also >> prior working support for backbuffer on older cards who not have >> EXT_framebuffer_object. Reverting to >> "OffscreenRenderingMode"="backbuffer" is not working as expected for >> me on r200 Mesa/DRI drivers, for example in Max Payne 2 which now >> can't be even starting with backbuffer, Rayman 2 and Dungen Siege 2 >> also. In 1.1.22>= they worked. >> > Please do a regression test to find the exact commit that breaks > "OffscreenRenderingMode"="backbuffer", and file a bug report. > Sorry i can't do regression test right now, slow connection (dial-up).

1 0

Re: gdiplus: Add test cases for GdipDrawCurve [corrected]
by Andrew Eikum June 6, 2009

June 6, 2009

This patch was submitted back on Tuesday and I haven't received a response one way or the other about it. Does anyone see anything immediately wrong with it? I more-or-less copied the functionality of test_GdipDrawBezier right above, testing each of the different input possibilities for correctness. It passes 100% on WinXP SP3 and Win7 RC1, although there are failures in Wine's GdipDrawCurve implementation. Thanks for taking a look, Andrew

3 6

Одговор: Latest Git build 7aeffc442cc1 for Wine 1.1.23
by Milan Kostić June 6, 2009

June 6, 2009

Deafulting to fbo is good, but it should be more good to leave also prior working support for backbuffer on older cards who not have EXT_framebuffer_object. Reverting to "OffscreenRenderingMode"="backbuffer" is not working as expected for me on r200 Mesa/DRI drivers, for example in Max Payne 2 which now can't be even starting with backbuffer, Rayman 2 and Dungen Siege 2 also. In 1.1.22>= they worked.

4 3

Re: Latest Git build 7aeffc442cc1 for Wine 1.1.23
by chris ahrendt June 6, 2009

June 6, 2009

On 06/05/2009 08:15 PM, Austin English wrote: > On Fri, Jun 5, 2009 at 7:11 PM, chris ahrendt<celticht32(a)yahoo.com> wrote: > >> Tried it several times.. and different iterations of the registry keys >> (you will find them attached) and both cases it fails the same way any >> of the d3d tests will fail or the machine locks up. >> > ????????

7 8

Re: user32/edit: Check for Null before strlen(try2)
by Nikolay Sivov June 6, 2009

June 6, 2009

André Hentschel wrote: > related to Bug 4742 > try2: fixed indentation > --- > dlls/user32/edit.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) --- - countA = strlen(textA) + 1; + if(textA) + countA = strlen(textA) + 1; } --- Previous lines use 2 tabs and 4 spaces after. Also a test is needed, looks like bug contains already something to start with.

3 4

Socks support in ws2_32
by Gabriele Greco June 6, 2009

June 6, 2009

Hello guys, I'm lurking this list since a pair of weeks but I've not yet posted here. I've added socks 4/5 support right inside of ws2_32 library, I've tested it with various applications and it works correctly both with sync and async sockets (only TCP). The code works very well also with fairly intensive network apps like "world of warcraft" :) At the moment the support is activated by enviroment variables (SOCKS_SERVER/SOCKS_PROTOCOL/SOCKS_USER/...) and the code is not very clean. I've seen that wine patches are not accepted if not cleaned up, so I wanted to ask if my effort can be of any interest for the official GIT or if I'll have to mantain it for myself on my local GIT (I've written this patch mostly for personal use since I need socks support to use certain services cut down by the company firewall). Obviously if there is any interest to see socks support inside wine I'll try to clean up the patch and make it follow the specs that the wine socks support is supposed to have (for instance configurability through winecfg for example). -- Bye, Gabry

6 5

Re: [1/5] user32: Added tests for DrawIcon and DrawIconEx
by Paul Vriens June 6, 2009

June 6, 2009

Joel Holdsworth wrote: > > ------------------------------------------------------------------------ > > Hi Joel, I've run your new tests on Win95, Win98 and NT4 (all VMware): Win95: ====== cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 00A0B0C0 with DrawIcon. Expected 00003163. Got 00003868 from line 1130 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 00A0B0C0 with DrawIcon. Expected 00FFCE9C. Got 00FFD0A0 from line 1131 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color FFA0B0C0 with DrawIcon. Expected 00003163. Got 00003868 from line 1133 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color FFA0B0C0 with DrawIcon. Expected 00FFCE9C. Got 00FFD0A0 from line 1134 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIcon. Expected 00003163. Got 00003868 from line 1135 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIcon. Expected 00FFCE9C. Got 00FFD0A0 from line 1136 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 00A0B0C0 with DrawIconEx flags 00000003. Expected 00003163. Got 00003868 from line 1262 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 00A0B0C0 with DrawIconEx flags 00000003. Expected 00FFCE9C. Got 00FFD0A0 from line 1263 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color FFA0B0C0 with DrawIconEx flags 00000003. Expected 00003163. Got 00003868 from line 1265 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color FFA0B0C0 with DrawIconEx flags 00000003. Expected 00FFCE9C. Got 00FFD0A0 from line 1266 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00003163. Got 00003868 from line 1267 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00FFCE9C. Got 00FFD0A0 from line 1268 Win98: ====== cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 00A0B0C0 with DrawIcon. Expected 00003163. Got 00003868 from line 1130 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 00A0B0C0 with DrawIcon. Expected 00FFCE9C. Got 00FFD0A0 from line 1131 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color FFA0B0C0 with DrawIcon. Expected 00003163. Got 00003868 from line 1133 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color FFA0B0C0 with DrawIcon. Expected 00FFCE9C. Got 00FFD0A0 from line 1134 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIcon. Expected 00003163. Got 00003868 from line 1135 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIcon. Expected 00FFCE9C. Got 00FFD0A0 from line 1136 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color FFA0B0C0 with DrawIcon. Expected 00C0B0A0. Got 003F4F5F from line 1081 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIcon. Expected 00605850. Got 00C0B0A0 from line 1083 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIcon. Expected 00605850. Got 00C0B0A0 from line 1084 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIcon. Expected 00DFD7CF. Got 00C0B0A0 from line 1085 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIcon. Expected 00DFD7CF. Got 003F4F5F from line 1086 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 01FFFFFF with DrawIcon. Expected 00010101. Got 00FFFFFF from line 1088 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 01FFFFFF with DrawIcon. Expected 00010101. Got 00FFFFFF from line 1089 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color FEFFFFFF with DrawIcon. Expected 00FEFEFE. Got 00FFFFFF from line 1090 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color FEFFFFFF with DrawIcon. Expected 00FEFEFE. Got 00FFFFFF from line 1091 cursoricon.c:1056: Test failed: Alpha blending. Expected 00FFFFFF with DrawIcon. Got 00C0B0A0 from line 1099 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color FFA0B0C0 with DrawIcon. Expected 00C0B0A0. Got 003F4F5F from line 1081 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIcon. Expected 00605850. Got 00C0B0A0 from line 1083 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIcon. Expected 00605850. Got 00C0B0A0 from line 1084 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIcon. Expected 00DFD7CF. Got 00C0B0A0 from line 1085 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIcon. Expected 00DFD7CF. Got 003F4F5F from line 1086 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color 01FFFFFF with DrawIcon. Expected 00010101. Got 00FFFFFF from line 1088 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color 01FFFFFF with DrawIcon. Expected 00010101. Got 00FFFFFF from line 1089 cursoricon.c:1013: Test failed: Overlaying Mask 0 on Color FEFFFFFF with DrawIcon. Expected 00FEFEFE. Got 00FFFFFF from line 1090 cursoricon.c:1013: Test failed: Overlaying Mask 1 on Color FEFFFFFF with DrawIcon. Expected 00FEFEFE. Got 00FFFFFF from line 1091 cursoricon.c:1056: Test failed: Alpha blending. Expected 00FFFFFF with DrawIcon. Got 00C0B0A0 from line 1099 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 00A0B0C0 with DrawIconEx flags 00000003. Expected 00003163. Got 00003868 from line 1262 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 00A0B0C0 with DrawIconEx flags 00000003. Expected 00FFCE9C. Got 00FFD0A0 from line 1263 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color FFA0B0C0 with DrawIconEx flags 00000003. Expected 00003163. Got 00003868 from line 1265 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color FFA0B0C0 with DrawIconEx flags 00000003. Expected 00FFCE9C. Got 00FFD0A0 from line 1266 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00003163. Got 00003868 from line 1267 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00FFCE9C. Got 00FFD0A0 from line 1268 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color FFA0B0C0 with DrawIconEx flags 00000003. Expected 00C0B0A0. Got 003F4F5F from line 1213 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00605850. Got 00C0B0A0 from line 1215 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00605850. Got 00C0B0A0 from line 1216 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00DFD7CF. Got 00C0B0A0 from line 1217 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00DFD7CF. Got 003F4F5F from line 1218 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 01FFFFFF with DrawIconEx flags 00000003. Expected 00010101. Got 00FFFFFF from line 1220 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 01FFFFFF with DrawIconEx flags 00000003. Expected 00010101. Got 00FFFFFF from line 1221 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color FEFFFFFF with DrawIconEx flags 00000003. Expected 00FEFEFE. Got 00FFFFFF from line 1222 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color FEFFFFFF with DrawIconEx flags 00000003. Expected 00FEFEFE. Got 00FFFFFF from line 1223 cursoricon.c:1056: Test failed: Alpha blending. Expected 00FFFFFF with DrawIconEx. Got 00C0B0A0 from line 1231 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color FFA0B0C0 with DrawIconEx flags 00000003. Expected 00C0B0A0. Got 003F4F5F from line 1213 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00605850. Got 00C0B0A0 from line 1215 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00605850. Got 00C0B0A0 from line 1216 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00DFD7CF. Got 00C0B0A0 from line 1217 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 80A0B0C0 with DrawIconEx flags 00000003. Expected 00DFD7CF. Got 003F4F5F from line 1218 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color 01FFFFFF with DrawIconEx flags 00000003. Expected 00010101. Got 00FFFFFF from line 1220 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color 01FFFFFF with DrawIconEx flags 00000003. Expected 00010101. Got 00FFFFFF from line 1221 cursoricon.c:1028: Test failed: Overlaying Mask 0 on Color FEFFFFFF with DrawIconEx flags 00000003. Expected 00FEFEFE. Got 00FFFFFF from line 1222 cursoricon.c:1028: Test failed: Overlaying Mask 1 on Color FEFFFFFF with DrawIconEx flags 00000003. Expected 00FEFEFE. Got 00FFFFFF from line 1223 cursoricon.c:1056: Test failed: Alpha blending. Expected 00FFFFFF with DrawIconEx. Got 00C0B0A0 from line 1231 NT4: ==== No failures. Is there another way you can detect whether some XP (and up) tests can be run? We generally try not to use GetVersion() in our tests. -- Cheers, Paul.

4 7

Re: user32/edit: Check for Null before strlen
by Paul Vriens June 6, 2009

June 6, 2009

André Hentschel wrote: > related to Bug 4742 > --- > dlls/user32/edit.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > > > ------------------------------------------------------------------------ > > Hi André, Your mixing tabs and spaces. -- Cheers, Paul.

1 0

Re: website: mention bugzilla registration on sending_patches
by Henri Verbeet June 6, 2009

June 6, 2009

2009/6/6 Jeff Zaroyko <jeffzaroyko(a)gmail.com>: > + <li>Register an account on the Wine bugzilla with the email address you use to send patches. Why would I do that?

2 2

Deadlock under Supreme Commander in d3d9 main.c
by James McKenzie June 6, 2009

June 6, 2009

As reported in another thread, Supreme Commander's graphic display slows considerably (<1 FPS), and if run in a terminal session a large number of lines are show in the terminal, but one line in particular is interesting to the poster: > Additionally, I am using a GeForce 7600GS card with the latest drivers (180.60, I believe - I'm not in front of it right now, but it's definitely the latest) The error itself is: > > > Code: > err:ntdll:RtlpWaitForCriticalSection section 0x7e114810 "d3d9_main.c: d3d9_cs" > wait timed out in thread 001f, blocked by 0009, retrying (60 sec) > This appears to be a revisit of the deadlocking issue as reported in bug 14746, but according to another triage person, this is not so. I would like to know if code has been moved from x11drv.c to d3d9_main.c that would cause this error and for the framerate to drop considerably. Thank you. James McKenzie

2 1

Re: Latest Git build 7aeffc442cc1 for Wine 1.1.23
by chris ahrendt June 6, 2009

June 6, 2009

Using this attached Reg File Is still a no go... same... (I forgot the Direct3D tag but added it and no change) Chris

2 1

re: Socks support in ws2_32
by Dan Kegel June 6, 2009

June 6, 2009

Gabriele Greco wrote: > I've added socks 4/5 support right inside of ws2_32 library... very cool! Juan wrote: > The usual test is whether Windows supports something. If Windows > has SOCKS support in ws2_32, then certainly, we're interested. If not, > figuring out how Windows does it and adding support for that method is > more likely to get accepted. http://msdn.microsoft.com/en-us/library/aa383996(VS.85).aspx says Windows has SOCKS support in the 27KB Wsock32n.dll The public API for using it is in wininet.dll. Annoyingly, that all requires the app to be aware of socks. - Dan

1 0