- Wine-Devel - list.winehq.org

Re: Resubmit SetWindowTextA() patch
by Mike McCormack June 6, 2005

June 6, 2005

Jason Campbell wrote: > +/* > FIXME( "cannot set text %s of other process window %p\n", > debugstr_a(lpString), hwnd ); > SetLastError( ERROR_ACCESS_DENIED ); > return FALSE; > +*/ > + FIXME( "not allowed by MSDN but some apps programmed this way" ); > } > return (BOOL)SendMessageA( hwnd, WM_SETTEXT, 0, (LPARAM)lpString ); > } Hi Jason, I think the fixme is not Wine enforcing a limitation imposed by MSDN, but preventing a problem from occuring because it's not supported properly by Wine, so though the above may work for a few applications, it doesn't seem like a solution that will work for everything. To do this the "right way" you'd need to write a test case to show what happens on Windows when somebody tries to set the title of another window. If this now works, you shouldn't just comment out the code in the if() statement, but instead remove the if() statement and FIXME all together. I suspect that it won't work correctly if the window has a visible caption bar. Mike

2 2

Summer of Code applications so far
by Dan Kegel June 6, 2005

June 6, 2005

Google hasn't sent out any applications to the mentoring organizations (e.g. Wine) yet, but they did just release a breakdown of the number of proposals recieved for each project. The count for Wine is at 77! No idea how many of those will make it through the selection process, but at least a few ought to be good. Here's the full breakdown from http://groups-beta.google.com/group/summer-discuss/msg/fd9e7ed643a3514d : 424 google 263 asf 213 gnome 209 gaim 204 other 156 psf 156 mono 126 ubuntu 90 freebsd 84 nmap 78 gallery 77 wine <------ 58 mambo 53 kde 49 svn 40 tpl 39 internet2 37 oo 35 fedoracore 33 lj 32 drupal 31 mozdev 29 handhelds 26 blender 25 winlibre 23 netbsd 23 codehaus 21 samba 21 jxta 18 xwiki 16 inkscape 15 plg 15 horde 14 semedia 13 jabber 12 asterisk 10 lispnyc 7 monotone 5 psu 5 oscar 5 ohiolink 5 bricolage TOTAL: 2795 -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

1 0

Re: [QUARTZ] More fixes
by Robert Shearman June 6, 2005

June 6, 2005

Christian Costa wrote: >Index: dlls/quartz/parser.c >=================================================================== >RCS file: /home/wine/wine/dlls/quartz/parser.c,v >retrieving revision 1.16 >diff -u -r1.16 parser.c >--- dlls/quartz/parser.c 6 Jun 2005 19:50:36 -0000 1.16 >+++ dlls/quartz/parser.c 6 Jun 2005 20:48:12 -0000 >@@ -221,6 +221,8 @@ > > TRACE("()\n"); > >+ if (This->state == State_Stopped) return S_OK; >+ > EnterCriticalSection(&This->csFilter); > { > hr = PullPin_StopProcessing(This->pInputPin); >@@ -239,6 +241,8 @@ > > TRACE("()\n"); > >+ if (This->state == State_Paused) return S_OK; >+ > EnterCriticalSection(&This->csFilter); > { > bInit = (This->state == State_Stopped); > > > These changes aren't thread safe. You should do the comparisons inside of the critical section. -- Rob Shearman

1 0

[RESEND] [d3d] Light management API test cases
by Antoine Chavasse June 6, 2005

June 6, 2005

ChangeLog: - Test cases for the direct3d7 light api. Index: dlls/ddraw/tests/.cvsignore =================================================================== RCS file: /home/wine/wine/dlls/ddraw/tests/.cvsignore,v retrieving revision 1.3 diff -u -p -r1.3 .cvsignore --- dlls/ddraw/tests/.cvsignore 30 May 2005 11:11:34 -0000 1.3 +++ dlls/ddraw/tests/.cvsignore 6 Jun 2005 18:13:18 -0000 @@ -1,4 +1,5 @@ Makefile ddrawmodes.ok dsurface.ok +d3d7light.ok testlist.c Index: dlls/ddraw/tests/Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/ddraw/tests/Makefile.in,v retrieving revision 1.4 diff -u -p -r1.4 Makefile.in --- dlls/ddraw/tests/Makefile.in 30 May 2005 11:11:34 -0000 1.4 +++ dlls/ddraw/tests/Makefile.in 6 Jun 2005 18:13:18 -0000 @@ -3,11 +3,12 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = ddraw.dll -IMPORTS = ddraw user32 gdi32 kernel32 +IMPORTS = ddraw dxguid user32 gdi32 kernel32 CTESTS = \ ddrawmodes.c \ - dsurface.c + dsurface.c \ + d3d7light.c @MAKE_TEST_RULES@ --- /dev/null 1970-01-01 01:00:00.000000000 +0100 +++ dlls/ddraw/tests/d3d7light.c 2005-06-06 20:10:12.998103616 +0200 @@ -0,0 +1,185 @@ +/* + * Some unit tests for direct3d7 light functions + * + * Copyright (C) 2005 Antoine Chavasse (a.chavasse(a)gmail.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <assert.h> +#include "wine/test.h" +#include "ddraw.h" +#include "d3d.h" + +static LPDIRECTDRAW7 lpDD = NULL; +static LPDIRECT3D7 lpD3D = NULL; +static LPDIRECTDRAWSURFACE7 lpDDS = NULL; +static LPDIRECT3DDEVICE7 lpD3DDevice = NULL; + +static void CreateDirect3D() +{ + HRESULT rc; + DDSURFACEDESC2 ddsd; + + rc = DirectDrawCreateEx(NULL, (void**)&lpDD, + &IID_IDirectDraw7, NULL); + ok(rc==DD_OK, "DirectDrawCreateEx returned: %lx\n", rc); + + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); + ok(rc==DD_OK, "SetCooperativeLevel returned: %lx\n", rc); + + rc = IDirectDraw7_QueryInterface(lpDD, &IID_IDirect3D7, (void**) &lpD3D); + ok(rc==DD_OK, "QueryInterface returned: %lx\n", rc); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + ddsd.dwWidth = 256; + ddsd.dwHeight = 256; + rc = IDirectDraw7_CreateSurface(lpDD, &ddsd, &lpDDS, NULL); + ok(rc==DD_OK, "CreateSurface returned: %lx\n", rc); + + rc = IDirect3D7_CreateDevice(lpD3D, &IID_IDirect3DTnLHalDevice, lpDDS, + &lpD3DDevice); + ok(rc==D3D_OK, "CreateDevice returned: %lx\n", rc); +} + +static void ReleaseDirect3D() +{ + if (lpD3DDevice != NULL) + { + IDirect3DDevice7_Release(lpD3DDevice); + lpD3DDevice = NULL; + } + + if (lpDDS != NULL) + { + IDirectDrawSurface_Release(lpDDS); + lpDDS = NULL; + } + + if (lpD3D != NULL) + { + IDirect3D7_Release(lpD3D); + lpD3D = NULL; + } + + if (lpDD != NULL) + { + IDirectDraw_Release(lpDD); + lpDD = NULL; + } +} + +static void LightTest() +{ + HRESULT rc; + D3DLIGHT7 light; + D3DLIGHT7 defaultlight; + BOOL bEnabled = FALSE; + + + /* Set a few lights with funky indices. */ + memset(&light, 0, sizeof(light)); + light.dltType = D3DLIGHT_DIRECTIONAL; + light.dcvDiffuse.r = 0.5f; + light.dcvDiffuse.g = 0.6f; + light.dcvDiffuse.b = 0.7f; + light.dvDirection.y = 1.f; + + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 5, &light); + ok(rc==D3D_OK, "SetLight returned: %lx\n", rc); + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 10, &light); + ok(rc==D3D_OK, "SetLight returned: %lx\n", rc); + rc = IDirect3DDevice7_SetLight(lpD3DDevice, 45, &light); + ok(rc==D3D_OK, "SetLight returned: %lx\n", rc); + + + /* Try to retrieve a light beyond the indices of the lights that have + been set. */ + rc = IDirect3DDevice7_GetLight(lpD3DDevice, 50, &light); + ok(rc==DDERR_INVALIDPARAMS, "GetLight returned: %lx\n", rc); + rc = IDirect3DDevice7_GetLight(lpD3DDevice, 2, &light); + ok(rc==DDERR_INVALIDPARAMS, "GetLight returned: %lx\n", rc); + + + /* Try to retrieve one of the lights that have been set */ + rc = IDirect3DDevice7_GetLight(lpD3DDevice, 10, &light); + ok(rc==D3D_OK, "GetLight returned: %lx\n", rc); + + + /* Enable a light that have been previously set. */ + rc = IDirect3DDevice7_LightEnable(lpD3DDevice, 10, TRUE); + ok(rc==D3D_OK, "LightEnable returned: %lx\n", rc); + + + /* Enable some lights that have not been previously set, and verify that + they have been initialized with proper default values. */ + memset(&defaultlight, 0, sizeof(D3DLIGHT7)); + defaultlight.dltType = D3DLIGHT_DIRECTIONAL; + defaultlight.dcvDiffuse.r = 1.f; + defaultlight.dcvDiffuse.g = 1.f; + defaultlight.dcvDiffuse.b = 1.f; + defaultlight.dvDirection.z = 1.f; + + rc = IDirect3DDevice7_LightEnable(lpD3DDevice, 20, TRUE); + ok(rc==D3D_OK, "LightEnable returned: %lx\n", rc); + memset(&light, 0, sizeof(D3DLIGHT7)); + rc = IDirect3DDevice7_GetLight(lpD3DDevice, 20, &light); + ok(rc==D3D_OK, "GetLight returned: %lx\n", rc); + ok(!memcmp(&light, &defaultlight, sizeof(D3DLIGHT7)), + "light data doesn't match expected default values\n" ); + + rc = IDirect3DDevice7_LightEnable(lpD3DDevice, 50, TRUE); + ok(rc==D3D_OK, "LightEnable returned: %lx\n", rc); + memset(&light, 0, sizeof(D3DLIGHT7)); + rc = IDirect3DDevice7_GetLight(lpD3DDevice, 50, &light); + ok(rc==D3D_OK, "GetLight returned: %lx\n", rc); + ok(!memcmp(&light, &defaultlight, sizeof(D3DLIGHT7)), + "light data doesn't match expected default values\n" ); + + + /* Disable one of the light that have been previously enabled. */ + rc = IDirect3DDevice7_LightEnable(lpD3DDevice, 20, FALSE); + ok(rc==D3D_OK, "LightEnable returned: %lx\n", rc); + + /* Try to retrieve the enable status of some lights */ + /* Light 20 is supposed to be disabled */ + rc = IDirect3DDevice7_GetLightEnable(lpD3DDevice, 20, &bEnabled ); + ok(rc==D3D_OK, "GetLightEnable returned: %lx\n", rc); + ok(!bEnabled, "GetLightEnable says the light is enabled\n"); + + /* Light 10 is supposed to be enabled */ + bEnabled = FALSE; + rc = IDirect3DDevice7_GetLightEnable(lpD3DDevice, 10, &bEnabled ); + ok(rc==D3D_OK, "GetLightEnable returned: %lx\n", rc); + ok(bEnabled, "GetLightEnable says the light is disabled\n"); + + /* Light 80 has not been set */ + rc = IDirect3DDevice7_GetLightEnable(lpD3DDevice, 80, &bEnabled ); + ok(rc==DDERR_INVALIDPARAMS, "GetLightEnable returned: %lx\n", rc); + + /* Light 23 has not been set */ + rc = IDirect3DDevice7_GetLightEnable(lpD3DDevice, 23, &bEnabled ); + ok(rc==DDERR_INVALIDPARAMS, "GetLightEnable returned: %lx\n", rc); +} + +START_TEST(d3d7light) +{ + CreateDirect3D(); + LightTest(); + ReleaseDirect3D(); +}

1 0

[RESEND] [d3d] Light management API fix to handle an unlimited number of lights
by Antoine Chavasse June 6, 2005

June 6, 2005

Resend of http://www.winehq.org/hypermail/wine-patches/2005/06/0103.html, adapted to Christian's reorganisation of ddraw directory, and as attachment to avoid gmail word-wrapping the patch :) ChangeLog: - Rewrote the light management API to allow for an unlimited amount of lights to be set, and only a subset of them to be enabled.

1 0

Re: Google "Summer of Code"
by Jesse Allen June 6, 2005

June 6, 2005

Mike Hearn said: We need more people working on app compatibility! :) Maybe we can choose some apps that are "nearly there" and get people to solve the last few bugs or alternatively make one of the projects "Bring any 3 apps up to Gold status in the appdb". Stefan DÃ¶singer said: I've a few app suggestions: Half-Life 1 (+Mods like Counter-Strike) Star Wars Jedi Knight Jedi Academy Star Wars Jedi Knight Jedi Outcast Warcraft III Microsoft Visual Basic Microsoft Visual C++ UltraISO Quicktime player Anno 1602 I am a super maintainer for Warcraft III. I *know* everything that needs to be fixed. In fact, I have been working on it for a long time. I just need a little more motivation to get the last major issues fixed. Now here's the deal. I need something to do this summer, and my job at IBM may be going away. I'm also a student at a local college here, and have been itching to do something. I've helped wine a bit before so I'm not a total new-comer. I know C, but can use more practice. So I'm willing to work to get three applications to gold status. Jedi Acadamy is probably doable as well, from what I've seen. But if anyone has suggestions I'm willing to look. I could help Ivan to get Safedisc to work too. So maybe if I can get a list of goals to reach, I will apply for it. Jesse

6 13

Re: [include/winternl.h #7] SYSTEM_PROCESS_INFORMATION
by Alexandre Julliard June 6, 2005

June 6, 2005

Paul Vriens <Paul.Vriens(a)xs4all.nl> writes: > I removed the __WINESRC__ bit as it will never be used and it makes the > (coming) tests look better (no private structure needed). > The Windows struct part in SYSTEM_PROCESS_INFORMATION is wrong anyway > (both by size and members). Actually in most cases the non __WINESRC__ case is the one you want to keep, since it comes from the Microsoft headers. You can replace the Reserved things with better names but you should keep at least the fields that have explicit names in the MS headers. If you have to change the layout more than that something is seriously wrong. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: Delete version sniffing logic
by Stefan Dösinger June 6, 2005

June 6, 2005

> The rationale for this change is simple: the version sniffing > code is unreliable and gets it wrong frequently. Out of the box, > you can't run "WINEDLLOVERRIDES=msi,msiexec.exe=n wine InstMsiA.exe" > because of this code. You just get silence. It turns out that even > though this is the Win98 version of the installer, it's detected > as a Windows XP binary. > > It's a lot simpler to have a single, sane default. This makes it > easier for users to understand, easier for us to control, and avoids > the case where different processes in the same program get different > version information. > > This patch defaults us to Win98 mode. Shouldn't we default to WinXP? I know no apps except Win98 specific system files like InstMsiA.exe and dcom98.exe which fail with Winver=winxp. Contrary many apps need winver=winxp(or win2k or nt40) to work, like the setup programs for MS Visual Studio and Microsoft Office 2003. Anyone who has an app which doesn't work with winver=winxp but works with real Windows XP? I think we should at least target Winver=winxp and fix broken apps. Stefan

4 4

Re: Wine on Sparc
by Chuck Hall June 6, 2005

June 6, 2005

> Chuck Hall wrote: >> Well it looks good. I did get a few failures on the patching, but it >> wnet >> through 'make depend' without a problem. >> >> Now I run into the problem in kthread.c: >> sed -e 's,@bindir\@,/usr/local/bin,g' -e >> 's,@dlldir\@,/usr/local/lib/wine,g' -e 's,@PACKAGE_STRING\@,Wine >> 20050524,g' ./wine.man.in >wine.man || (rm -f wine.man && false) >> gcc -c -I. -I. -I../include -I../include -Wall -pipe >> -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o kthread.o >> kthread.c >> kthread.c:322:3: #error You must implement wine_pthread_init_current_teb >> for your platform >> kthread.c:361:3: #error wine_pthread_get_current_teb not defined for >> this >> architecture >> kthread.c: In function `wine_pthread_get_current_teb': >> kthread.c:340: warning: 'ret' might be used uninitialized in this >> function >> *** Error code 1 >> make: Fatal error: Command failed for target `kthread.o' >> Current working directory /tmp/wine-20050524/loader >> *** Error code 1 >> The following command caused the error: >> cd loader && make >> make: Fatal error: Command failed for target `loader' >> >> Guess this is the next problem to work on :) > > Sounds like configure isn't detecting things properly. It should be > detecting '_lwp_create' and '_lwp_self', thus defining HAVE__LWP_CREATE > and HAVE__LWP_SELF (in addition to HAVE_SYS_LWP_H). Check your > config.log to see what's going on. > > I did have problems with this stuff in older versions of wine, and I > actually hacked the configure scripts to use wine-pthread instead of > wine-kthread. I don't recall the exact reasons, but it wine-kthread > seems to be working fine for me now. Started to go through this and found something intresting. lwp.h does exist and is found, so HAVE_SYS_LWP_H is defined. The test for _lwp_create fails. Looking a bit deeper I found that the lwp.h for Solaris 9 is different from the one in Solaris 10 (which is what I am using). Based on this and something I read awhile ago, I belive that Sun is attempting to phase out the lwp stuff on Solaris. It looks like a workaround will need to be created for _lwp_create. I will look into this and see what is the "official" way to write the code now, if any. Also a workaround will need to be made for all other _lwp_* calls that no longer exist. Have Fun! Chuck Hall

3 3

Re: [OLE #94] Correctly marshal NULL ppUnk refptrs in NdrPointerMarshall
by Robert Shearman June 6, 2005

June 6, 2005

Mike Hearn wrote: >This corrects an attempt to demarshal garbage during InstallShield10 >startup. For full InstallShield 10 support we need a stdole2.tlb > >Mike Hearn <mh(a)codeweavers.com> >Correctly marshal NULL ppUnk refptrs in NdrPointerMarshall > >Index: dlls/rpcrt4/ndr_marshall.c >=================================================================== >RCS file: /home/wine/wine/dlls/rpcrt4/ndr_marshall.c,v >retrieving revision 1.24 >diff -u -p -d -u -r1.24 ndr_marshall.c >--- dlls/rpcrt4/ndr_marshall.c 1 Jun 2005 11:04:03 -0000 1.24 >+++ dlls/rpcrt4/ndr_marshall.c 5 Jun 2005 22:03:11 -0000 >@@ -575,19 +575,19 @@ void WINAPI PointerMarshall(PMIDL_STUB_M > TRACE("(%p,%p,%p,%p)\n", pStubMsg, Buffer, Pointer, pFormat); > TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); > pFormat += 2; >+ > if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; > else desc = pFormat + *(const SHORT*)pFormat; >+ > if (attr & RPC_FC_P_DEREF) { >+ if (!Pointer) >+ RpcRaiseException(RPC_X_NULL_REF_POINTER); > Pointer = *(unsigned char**)Pointer; > TRACE("deref => %p\n", Pointer); > } > > switch (type) { >- case RPC_FC_RP: /* ref pointer (always non-null) */ >-#if 0 /* this causes problems for InstallShield so is disabled - we need more tests */ >- if (!Pointer) >- RpcRaiseException(RPC_X_NULL_REF_POINTER); >-#endif >+ case RPC_FC_RP: /* ref pointer (always non-null but may point to null) */ > break; > case RPC_FC_UP: /* unique pointer */ > case RPC_FC_OP: /* object pointer - same as unique here */ > > > This looks wrong. A ref pointer shouldn't be treated as a unique pointer in any circumstances AFAIK. I'll add this case to my mini test suite to confirm or deny this hypothesis. -- Rob Shearman

2 3