wine-devel July 2010

wine-devel@winehq.org

114 participants
459 discussions

Re: [3/8] msi: Move the component enabled check into the standard actions.
by testbot＠testbot.winehq.org 21 Jul '10

21 Jul '10

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=3641 Your paranoid android. === WXPPROSP3 (32 bit install) === Timeout === W2K8SE (32 bit install) === Timeout === W7PROX64 (32 bit install) === install.c:5409: Test failed: Expected "C:\Program Files (x86)\msitest\maximus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" install.c:5428: Test failed: Expected "01\msitest\augustus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" install.c:5453: Test failed: Expected "C:\Program Files (x86)\msitest\maximus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" install.c:5472: Test failed: Expected "01\msitest\augustus", got "Software\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products\84A88FD7F6998CE40A22FB59F6B9C2BB\InstallProperties" === W7PROX64 (64 bit install) === install.c:5654: Test failed: Expected ERROR_SUCCESS, got 2 install.c:5656: Test failed: Key doesn't exist or wrong type install.c:5657: Test failed: Key doesn't exist or wrong type install.c:5658: Test failed: Key doesn't exist or wrong type install.c:5659: Test failed: Key doesn't exist or wrong type install.c:5660: Test failed: Key doesn't exist or wrong type install.c:5661: Test failed: Key doesn't exist or wrong type install.c:5662: Test failed: Key doesn't exist or wrong type install.c:5663: Test failed: Key doesn't exist or wrong type install.c:5664: Test failed: Key doesn't exist or wrong type install.c:5665: Test failed: Key doesn't exist or wrong type install.c:5666: Test failed: Key doesn't exist or wrong type install.c:5667: Test failed: Key doesn't exist or wrong type install.c:5668: Test failed: Key doesn't exist or wrong type install.c:5669: Test failed: Key doesn't exist or wrong type install.c:5670: Test failed: Key doesn't exist or wrong type install.c:5671: Test failed: Key doesn't exist or wrong type install.c:5672: Test failed: Key doesn't exist or wrong type install.c:5673: Test failed: Key doesn't exist or wrong type install.c:5674: Test failed: Key doesn't exist or wrong type install.c:5675: Test failed: Key doesn't exist or wrong type install.c:5676: Test failed: Key doesn't exist or wrong type install.c:5677: Test failed: Key doesn't exist or wrong type install.c:5680: Test failed: Key doesn't exist or wrong type install.c:5729: Test failed: Expected ERROR_SUCCESS, got 2 install.c:5731: Test failed: Key doesn't exist or wrong type install.c:5732: Test failed: Key doesn't exist or wrong type install.c:5733: Test failed: Key doesn't exist or wrong type install.c:5734: Test failed: Key doesn't exist or wrong type install.c:5735: Test failed: Key doesn't exist or wrong type install.c:5736: Test failed: Key doesn't exist or wrong type install.c:5737: Test failed: Key doesn't exist or wrong type install.c:5738: Test failed: Key doesn't exist or wrong type install.c:5739: Test failed: Key doesn't exist or wrong type install.c:5740: Test failed: Key doesn't exist or wrong type install.c:5741: Test failed: Key doesn't exist or wrong type install.c:5742: Test failed: Key doesn't exist or wrong type install.c:5743: Test failed: Key doesn't exist or wrong type install.c:5744: Test failed: Key doesn't exist or wrong type install.c:5745: Test failed: Key doesn't exist or wrong type install.c:5746: Test failed: Key doesn't exist or wrong type install.c:5747: Test failed: Key doesn't exist or wrong type install.c:5748: Test failed: Key doesn't exist or wrong type install.c:5749: Test failed: Key doesn't exist or wrong type install.c:5750: Test failed: Key doesn't exist or wrong type install.c:5751: Test failed: Key doesn't exist or wrong type install.c:5752: Test failed: Key doesn't exist or wrong type install.c:5755: Test failed: Key doesn't exist or wrong type install.c:5781: Test failed: Expected ERROR_SUCCESS, got 2 install.c:5783: Test failed: Key doesn't exist or wrong type install.c:5784: Test failed: Key doesn't exist or wrong type install.c:5785: Test failed: Key doesn't exist or wrong type install.c:5786: Test failed: Key doesn't exist or wrong type install.c:5787: Test failed: Key doesn't exist or wrong type install.c:5788: Test failed: Key doesn't exist or wrong type install.c:5789: Test failed: Key doesn't exist or wrong type install.c:5790: Test failed: Key doesn't exist or wrong type install.c:5791: Test failed: Key doesn't exist or wrong type install.c:5792: Test failed: Key doesn't exist or wrong type install.c:5793: Test failed: Key doesn't exist or wrong type install.c:5794: Test failed: Key doesn't exist or wrong type install.c:5795: Test failed: Key doesn't exist or wrong type install.c:5796: Test failed: Key doesn't exist or wrong type install.c:5797: Test failed: Key doesn't exist or wrong type install.c:5798: Test failed: Key doesn't exist or wrong type install.c:5799: Test failed: Key doesn't exist or wrong type install.c:5800: Test failed: Key doesn't exist or wrong type install.c:5801: Test failed: Key doesn't exist or wrong type install.c:5802: Test failed: Key doesn't exist or wrong type install.c:5803: Test failed: Key doesn't exist or wrong type install.c:5804: Test failed: Key doesn't exist or wrong type install.c:5807: Test failed: Key doesn't exist or wrong type install.c:5833: Test failed: Expected ERROR_SUCCESS, got 2 install.c:5835: Test failed: Key doesn't exist or wrong type install.c:5836: Test failed: Key doesn't exist or wrong type install.c:5837: Test failed: Key doesn't exist or wrong type install.c:5838: Test failed: Key doesn't exist or wrong type install.c:5839: Test failed: Key doesn't exist or wrong type install.c:5840: Test failed: Key doesn't exist or wrong type install.c:5841: Test failed: Key doesn't exist or wrong type install.c:5842: Test failed: Key doesn't exist or wrong type install.c:5843: Test failed: Key doesn't exist or wrong type install.c:5844: Test failed: Key doesn't exist or wrong type install.c:5845: Test failed: Key doesn't exist or wrong type install.c:5846: Test failed: Key doesn't exist or wrong type install.c:5847: Test failed: Key doesn't exist or wrong type install.c:5848: Test failed: Key doesn't exist or wrong type install.c:5849: Test failed: Key doesn't exist or wrong type install.c:5850: Test failed: Key doesn't exist or wrong type install.c:5851: Test failed: Key doesn't exist or wrong type install.c:5852: Test failed: Key doesn't exist or wrong type install.c:5853: Test failed: Key doesn't exist or wrong type install.c:5854: Test failed: Key doesn't exist or wrong type install.c:5855: Test failed: Key doesn't exist or wrong type install.c:5856: Test failed: Key doesn't exist or wrong type install.c:5859: Test failed: Key doesn't exist or wrong type install.c:5908: Test failed: Expected ERROR_SUCCESS, got 2 install.c:5910: Test failed: Key doesn't exist or wrong type install.c:5911: Test failed: Key doesn't exist or wrong type install.c:5912: Test failed: Key doesn't exist or wrong type install.c:5913: Test failed: Key doesn't exist or wrong type install.c:5914: Test failed: Key doesn't exist or wrong type install.c:5915: Test failed: Key doesn't exist or wrong type install.c:5916: Test failed: Key doesn't exist or wrong type install.c:5917: Test failed: Key doesn't exist or wrong type install.c:5918: Test failed: Key doesn't exist or wrong type install.c:5919: Test failed: Key doesn't exist or wrong type install.c:5920: Test failed: Key doesn't exist or wrong type install.c:5921: Test failed: Key doesn't exist or wrong type install.c:5922: Test failed: Key doesn't exist or wrong type install.c:5923: Test failed: Key doesn't exist or wrong type install.c:5924: Test failed: Key doesn't exist or wrong type install.c:5925: Test failed: Key doesn't exist or wrong type install.c:5926: Test failed: Key doesn't exist or wrong type install.c:5927: Test failed: Key doesn't exist or wrong type install.c:5928: Test failed: Key doesn't exist or wrong type install.c:5929: Test failed: Key doesn't exist or wrong type install.c:5930: Test failed: Key doesn't exist or wrong type install.c:5931: Test failed: Key doesn't exist or wrong type install.c:5934: Test failed: Key doesn't exist or wrong type install.c:6879: Test failed: Expected ERROR_SUCCESS, got 2 install.c:6885: Test failed: Expected ERROR_SUCCESS, got 6 install.c:6886: Test failed: Wrong multi-sz data install.c:6887: Test failed: Expected 15, got 260 install.c:9079: Test failed: key not removed install.c:9089: Test failed: key not removed install.c:9100: Test failed: key not removed install.c:9330: Test failed: key not created

1 0

Re: ddraw: Allow creating back buffer for pre-DirectX 7 interfaces.
by Stefan Dösinger 21 Jul '10

21 Jul '10

Allowing the creation of the surface is most likely not enough, the backbuffer has to be useable after it has been created. Specifically, when the app attaches the backbuffer to the frontbuffer(assuming this works, needs a test) wined3d has to be made aware of the change - there's a SetFrontBackBuffers method in the wined3d device to reconfigure the primary swapchain. Am 19.07.2010 um 19:27 schrieb Oldřich Jedlička: > This fixes bug #9008. > --- > dlls/ddraw/ddraw.c | 25 +++++++++++++++++++++---- > dlls/ddraw/ddraw_private.h | 3 +++ > dlls/ddraw/ddraw_thunks.c | 24 ++++++++++++------------ > 3 files changed, 36 insertions(+), 16 deletions(-) > > diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c > index 05c8c62..cf90c39 100644 > --- a/dlls/ddraw/ddraw.c > +++ b/dlls/ddraw/ddraw.c > @@ -2295,6 +2295,7 @@ static HRESULT IDirectDrawImpl_CreateGDISwapChain(IDirectDrawImpl *ddraw, IDirec > * Surf: Address to store the interface pointer at > * UnkOuter: Basically for aggregation support, but ddraw doesn't support > * aggregation, so it has to be NULL > + * AllowBackBuffer: Allow (TRUE) creation of explicit back buffer > * > * Returns: > * DD_OK on success > @@ -2302,11 +2303,12 @@ static HRESULT IDirectDrawImpl_CreateGDISwapChain(IDirectDrawImpl *ddraw, IDirec > * DDERR_* if an error occurs > * > *****************************************************************************/ > -static HRESULT WINAPI > +HRESULT WINAPI > IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, > DDSURFACEDESC2 *DDSD, > IDirectDrawSurface7 **Surf, > - IUnknown *UnkOuter) > + IUnknown *UnkOuter, > + BOOL AllowBackBuffer) > { > IDirectDrawImpl *This = (IDirectDrawImpl *)iface; > IDirectDrawSurfaceImpl *object = NULL; > @@ -2368,7 +2370,13 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, > return DDERR_NOEXCLUSIVEMODE; > } > > - if(DDSD->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { > + if(AllowBackBuffer && (DDSD->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER))) { > + WARN("Application tried to create an explicit front buffer\n"); > + LeaveCriticalSection(&ddraw_cs); > + return DDERR_INVALIDCAPS; > + } > + > + if (!AllowBackBuffer && (DDSD->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER))) { > WARN("Application tried to create an explicit front or back buffer\n"); > LeaveCriticalSection(&ddraw_cs); > return DDERR_INVALIDCAPS; > @@ -2727,6 +2735,15 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, > return hr; > } > > +static HRESULT WINAPI > +IDirectDraw7Impl_CreateSurface(IDirectDraw7 *iface, > + DDSURFACEDESC2 *DDSD, > + IDirectDrawSurface7 **Surf, > + IUnknown *UnkOuter) > +{ > + return IDirectDrawImpl_CreateSurface(iface, DDSD, Surf, UnkOuter, FALSE); > +} > + > #define DDENUMSURFACES_SEARCHTYPE (DDENUMSURFACES_CANBECREATED|DDENUMSURFACES_DOESEXIST) > #define DDENUMSURFACES_MATCHTYPE (DDENUMSURFACES_ALL|DDENUMSURFACES_MATCH|DDENUMSURFACES_NOMATCH) > > @@ -3105,7 +3122,7 @@ const IDirectDraw7Vtbl IDirectDraw7_Vtbl = > IDirectDrawImpl_Compact, > IDirectDrawImpl_CreateClipper, > IDirectDrawImpl_CreatePalette, > - IDirectDrawImpl_CreateSurface, > + IDirectDraw7Impl_CreateSurface, > IDirectDrawImpl_DuplicateSurface, > IDirectDrawImpl_EnumDisplayModes, > IDirectDrawImpl_EnumSurfaces, > diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h > index 3de8668..9810c6f 100644 > --- a/dlls/ddraw/ddraw_private.h > +++ b/dlls/ddraw/ddraw_private.h > @@ -303,6 +303,9 @@ extern const IDirectDrawGammaControlVtbl IDirectDrawGammaControl_Vtbl DECLSPEC_H > extern const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl DECLSPEC_HIDDEN; > extern const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl DECLSPEC_HIDDEN; > > +HRESULT WINAPI IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 *DDSD, > + IDirectDrawSurface7 **Surf, IUnknown *UnkOuter, BOOL AllowBackBuffer) DECLSPEC_HIDDEN; > + > HRESULT WINAPI IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This, > IDirectDrawSurfaceImpl *Surf) DECLSPEC_HIDDEN; > void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN; > diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c > index 2c205e9..7d6396c 100644 > --- a/dlls/ddraw/ddraw_thunks.c > +++ b/dlls/ddraw/ddraw_thunks.c > @@ -331,9 +331,9 @@ static void set_surf_version(IDirectDrawSurfaceImpl *surf, int version) > } > > static HRESULT WINAPI > -IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, > - LPDIRECTDRAWSURFACE *ppSurface, > - IUnknown *pUnkOuter) > +IDirectDraw1Impl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, > + LPDIRECTDRAWSURFACE *ppSurface, > + IUnknown *pUnkOuter) > { > LPDIRECTDRAWSURFACE7 pSurface7; > IDirectDrawSurfaceImpl *impl; > @@ -345,8 +345,8 @@ IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, > pSDesc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; > /* the LPDDSURFACEDESC -> LPDDSURFACEDESC2 conversion should be ok, > * since the data layout is the same */ > - hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw1(This), > - (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); > + hr = IDirectDrawImpl_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw1(This), > + (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter, TRUE); > if (FAILED(hr)) > { > *ppSurface = NULL; > @@ -371,8 +371,8 @@ IDirectDraw2Impl_CreateSurface(LPDIRECTDRAW2 This, LPDDSURFACEDESC pSDesc, > IDirectDrawSurfaceImpl *impl; > HRESULT hr; > > - hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw2(This), > - (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); > + hr = IDirectDrawImpl_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw2(This), > + (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter, TRUE); > if (FAILED(hr)) > { > *ppSurface = NULL; > @@ -397,8 +397,8 @@ IDirectDraw3Impl_CreateSurface(LPDIRECTDRAW3 This, LPDDSURFACEDESC pSDesc, > IDirectDrawSurfaceImpl *impl; > HRESULT hr; > > - hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw3(This), > - (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); > + hr = IDirectDrawImpl_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw3(This), > + (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter, TRUE); > if (FAILED(hr)) > { > *ppSurface = NULL; > @@ -423,8 +423,8 @@ IDirectDraw4Impl_CreateSurface(LPDIRECTDRAW4 This, LPDDSURFACEDESC2 pSDesc, > HRESULT hr; > IDirectDrawSurfaceImpl *impl; > > - hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw4(This), > - pSDesc, (LPDIRECTDRAWSURFACE7 *)ppSurface, pUnkOuter); > + hr = IDirectDrawImpl_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw4(This), > + pSDesc, (LPDIRECTDRAWSURFACE7 *)ppSurface, pUnkOuter, TRUE); > impl = (IDirectDrawSurfaceImpl *)*ppSurface; > if(SUCCEEDED(hr) && impl) > { > @@ -1092,7 +1092,7 @@ const IDirectDrawVtbl IDirectDraw1_Vtbl = > IDirectDrawImpl_Compact, > IDirectDrawImpl_CreateClipper, > IDirectDrawImpl_CreatePalette, > - IDirectDrawImpl_CreateSurface, > + IDirectDraw1Impl_CreateSurface, > IDirectDrawImpl_DuplicateSurface, > IDirectDrawImpl_EnumDisplayModes, > IDirectDrawImpl_EnumSurfaces, > -- > 1.7.1.1 > > >

3 6

Re: [2/2] user32: Prevent resize of minimized windows from SetWindowPos (Bug 1719).
by testbot＠testbot.winehq.org 21 Jul '10

21 Jul '10

2 1

Re: [1/2] user32/tests: Minimized windows shouldn't be resizable.
by testbot＠testbot.winehq.org 21 Jul '10

21 Jul '10

1 0

Re: [PATCH] shlwapi: Be less strict on which type of IShellFolder can be enumerated
by testbot＠testbot.winehq.org 20 Jul '10

20 Jul '10

1 0

Re: [3\4] d3d9: Partially implement GetAdapterDisplayModeEx
by Chris Robinson 20 Jul '10

20 Jul '10

On Tuesday, July 20, 2010 2:28:44 pm Louis Lenders wrote: > + TRACE("iface %p, adapter %u, mode %p.\n", iface, adapter, mode); > + TRACE("iface %p, adapter %u, mode %p, rotation %p\n", iface, adapter, > mode, rotation); This doesn't look right. You probably only need the second TRACE statement, there. It also looks like adapterinfo is being leaked. Any reason you HeapAlloc one to pass in, instead of passing a pointer to a stack object? Eg: struct wined3d_adapter_info_ex adapterinfo; ... hr = IWineD3D_GetAdapterDisplayMode(This->WineD3D, adapter, &m, &adapterinfo);

1 0

Quick legal question... teapot related
by Misha Koshelev 20 Jul '10

20 Jul '10

If I take a publicly available teaset: http://www.sjbaker.org/teapot/teaset.tgz And run it through a Microsoft function: http://msdn.microsoft.com/en-us/library/bb205470%28v=VS.85%29.aspx D3DXTesselateRectPatch for example And then copy the vertex buffer and index buffer and save them... Do I have the rights to use the vertex and index buffers? I am assuming yes... but wanted to double check first. Thank you Misha

4 4

Fyi patch submission information on wiki updated for GitHub
by Misha Koshelev 20 Jul '10

20 Jul '10

My apologies, but it seems that only such a convoluted shell script seems to achieve the correct results for different remotes: http://wiki.winehq.org/GitWine#head-3fe70b8c0310e61d94ba30fe7edf19bd0630e1ef If anyone has a simpler solution, I can definitely update. Unfortunately, the more intuitive git format-patch -k --stdout HEAD~79..HEAD~78 > /tmp/patch.old does not seem to result in patches that can be properly applied onto a different (upstream) remote (see below). Thank you Misha p.s. For the curious I have attached both the patch.old generated using the command above, as well as the patch generated by: git format-patch -k -o out --branches --not --remotes=wine-git I have also attached relevant diff at the very bottom. Output of: diff /tmp/patch.old out/0001 Thank you --- misha@misha-d630:~/src/wine-git$ git reset --hard origin HEAD is now at 15c6057 shlwapi: Implement StrStrNIW. misha@misha-d630:~/src/wine-git$ git am /tmp/patch.old Applying: d3dx9: Add tests for D3DXCreateSphere vertex buffer description. error: patch failed: dlls/d3dx9_36/tests/mesh.c:489 error: dlls/d3dx9_36/tests/mesh.c: patch does not apply Patch failed at 0001 d3dx9: Add tests for D3DXCreateSphere vertex buffer description. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". misha@misha-d630:~/src/wine-git$

2 3

Re: [PATCH 7/7] d3d10: Implement D3D10ReflectShader().
by Henri Verbeet 20 Jul '10

20 Jul '10

2010/7/19 Rico Schüller <kgbricola(a)web.de>: > + e[i].SemanticName = get_semantic(data + name_offset); I'm not sure this will work, I was under the impression semantics can be arbitrary strings. (Which is also why d3d10core goes through the trouble of copying the string data.)

2 1

Re: wined3d: Add Nvidia 8800GTX detection
by Henri Verbeet 20 Jul '10

20 Jul '10

On 20 July 2010 15:49, Luke Bratch <l_bratch(a)yahoo.co.uk> wrote: > Adds detection for the Nvidia 8800GTX card and sets its video memory correctly. > > I have sent this patch in the past but it got rejected, as this method of calculating video card type/memory wasn't supposed to stay around forever, but another similar patch got accepted yesterday so I'm trying again. > I mostly let Roderick worry about card detection, but at the very least this patch has a trailing tab and a driver version number that's inconsistent with the other entries.

2 2

← Newer
1
...
18
19
20
21
22
23
24
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2010